Attachment #308789 for bug #411585

Lines 20-24 obj-$(CONFIG_EVENT_TRACING) += trace.o Link Here

(-)a/arch/x86/xen/Makefile (-1 / +1 lines)
20	obj-$(CONFIG_SMP) += smp.o	20	obj-$(CONFIG_SMP) += smp.o
21	obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o	21	obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o
22	obj-$(CONFIG_XEN_DEBUG_FS) += debugfs.o	22	obj-$(CONFIG_XEN_DEBUG_FS) += debugfs.o
23	obj-$(CONFIG_XEN_DOM0) += vga.o	23	obj-$(CONFIG_XEN_DOM0) += apic.o vga.o
24	obj-$(CONFIG_SWIOTLB_XEN) += pci-swiotlb-xen.o	24	obj-$(CONFIG_SWIOTLB_XEN) += pci-swiotlb-xen.o




#include <linux/init.h>
#include <asm/x86_init.h>

unsigned int xen_io_apic_read(unsigned apic, unsigned reg)
{
	if (reg == 0x1)
		return 0x00170020;
	else if (reg == 0x0)
		return apic << 24;

	return 0xff;
}

void __init xen_init_apic(void)
{
	x86_ioapic.read = xen_io_apic_read;
}

Lines 1271-1276 asmlinkage void __init xen_start_kernel(void) Link Here

(-)a/arch/x86/xen/enlighten.c (+2 lines)
1271	xen_start_info->console.domU.mfn = 0;	1271	xen_start_info->console.domU.mfn = 0;
1272	xen_start_info->console.domU.evtchn = 0;	1272	xen_start_info->console.domU.evtchn = 0;
1273		1273
		1274	xen_init_apic();
		1275
1274	/* Make sure ACS will be enabled */	1276	/* Make sure ACS will be enabled */
1275	pci_request_acs();	1277	pci_request_acs();
1276	}	1278	}

Lines 92-102 struct dom0_vga_console_info; Link Here

(-)a/arch/x86/xen/xen-ops.h (-1 / +4 lines)
92		92
93	#ifdef CONFIG_XEN_DOM0	93	#ifdef CONFIG_XEN_DOM0
94	void __init xen_init_vga(const struct dom0_vga_console_info *, size_t size);	94	void __init xen_init_vga(const struct dom0_vga_console_info *, size_t size);
		95	void __init xen_init_apic(void);
95	#else	96	#else
96	static inline void __init xen_init_vga(const struct dom0_vga_console_info *info,	97	static inline void __init xen_init_vga(const struct dom0_vga_console_info *info,
97	size_t size)	98	size_t size)
98	{	99	{
99	}	100	}
		101	static inline void __init xen_init_apic(void)
		102	{
		103	}
100	#endif	104	#endif
101		105
102	/* Declare an asm function, along with symbols needed to make it	106	/* Declare an asm function, along with symbols needed to make it
103	-

Return to bug 411585

Line 0 Link Here

(-)a/arch/x86/xen/apic.c (+17 lines)
	1	#include <linux/init.h>
	2	#include <asm/x86_init.h>
	3
	4	unsigned int xen_io_apic_read(unsigned apic, unsigned reg)
	5	{
	6	if (reg == 0x1)
	7	return 0x00170020;
	8	else if (reg == 0x0)
	9	return apic << 24;
	10
	11	return 0xff;
	12	}
	13
	14	void __init xen_init_apic(void)
	15	{
	16	x86_ioapic.read = xen_io_apic_read;
	17	}