Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86, apic: fix build fallout of genapic changes

- make oprofile build
- select X86_X2APIC from X86_UV - it relies on it
- export genapic for oprofile modular build

Signed-off-by: Ingo Molnar <mingo@elte.hu>

+8 -4
+1
arch/x86/Kconfig
··· 316 316 bool "SGI Ultraviolet" 317 317 depends on X86_64 318 318 depends on X86_EXTENDED_PLATFORM 319 + select X86_X2APIC 319 320 ---help--- 320 321 This option is needed in order to support SGI Ultraviolet systems. 321 322 If you don't have one of these, you should say N here.
+1 -1
arch/x86/kernel/cpu/mcheck/p4.c
··· 11 11 #include <asm/processor.h> 12 12 #include <asm/system.h> 13 13 #include <asm/msr.h> 14 - #include <asm/apic.h> 14 + #include <asm/genapic.h> 15 15 16 16 #include <asm/therm_throt.h> 17 17
+1
arch/x86/kernel/genapic_64.c
··· 30 30 extern struct genapic apic_x2apic_cluster; 31 31 32 32 struct genapic __read_mostly *apic = &apic_flat; 33 + EXPORT_SYMBOL_GPL(apic); 33 34 34 35 static struct genapic *apic_probe[] __initdata = { 35 36 #ifdef CONFIG_X86_UV
+2
arch/x86/kernel/probe_32.c
··· 8 8 */ 9 9 #include <linux/threads.h> 10 10 #include <linux/cpumask.h> 11 + #include <linux/module.h> 11 12 #include <linux/string.h> 12 13 #include <linux/kernel.h> 13 14 #include <linux/ctype.h> ··· 144 143 extern struct genapic apic_default; 145 144 146 145 struct genapic *apic = &apic_default; 146 + EXPORT_SYMBOL_GPL(apic); 147 147 148 148 static struct genapic *apic_probe[] __initdata = { 149 149 #ifdef CONFIG_X86_NUMAQ
+1 -1
arch/x86/oprofile/nmi_int.c
··· 19 19 #include <linux/cpu.h> 20 20 #include <asm/nmi.h> 21 21 #include <asm/msr.h> 22 - #include <asm/apic.h> 22 + #include <asm/genapic.h> 23 23 24 24 #include "op_counter.h" 25 25 #include "op_x86_model.h"
+1 -1
arch/x86/oprofile/op_model_p4.c
··· 14 14 #include <linux/nmi.h> 15 15 #include <asm/msr.h> 16 16 #include <asm/fixmap.h> 17 - #include <asm/apic.h> 17 + #include <asm/genapic.h> 18 18 19 19 20 20 #include "op_x86_model.h"
+1 -1
arch/x86/oprofile/op_model_ppro.c
··· 16 16 #include <linux/slab.h> 17 17 #include <asm/ptrace.h> 18 18 #include <asm/msr.h> 19 - #include <asm/apic.h> 19 + #include <asm/genapic.h> 20 20 #include <asm/nmi.h> 21 21 #include <asm/intel_arch_perfmon.h> 22 22