diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-17 12:33:20 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-17 13:13:25 +0100 |
| commit | 7d01d32d3b9becd6deba318b718db3d9fc181d23 (patch) | |
| tree | 70f866bac39065812cd81d298a9bf16e8b60a449 | |
| parent | c1eeb2de41d7015678bdd412b48a5f071b84e29a (diff) | |
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>
| -rw-r--r-- | arch/x86/Kconfig | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/p4.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/genapic_64.c | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/probe_32.c | 2 | ||||
| -rw-r--r-- | arch/x86/oprofile/nmi_int.c | 2 | ||||
| -rw-r--r-- | arch/x86/oprofile/op_model_p4.c | 2 | ||||
| -rw-r--r-- | arch/x86/oprofile/op_model_ppro.c | 2 |
7 files changed, 8 insertions, 4 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index bce241fe1d2..8955262caa3 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -316,6 +316,7 @@ config X86_UV bool "SGI Ultraviolet" depends on X86_64 depends on X86_EXTENDED_PLATFORM + select X86_X2APIC ---help--- This option is needed in order to support SGI Ultraviolet systems. If you don't have one of these, you should say N here. diff --git a/arch/x86/kernel/cpu/mcheck/p4.c b/arch/x86/kernel/cpu/mcheck/p4.c index 9b60fce09f7..f9c92b66dfb 100644 --- a/arch/x86/kernel/cpu/mcheck/p4.c +++ b/arch/x86/kernel/cpu/mcheck/p4.c @@ -11,7 +11,7 @@ #include <asm/processor.h> #include <asm/system.h> #include <asm/msr.h> -#include <asm/apic.h> +#include <asm/genapic.h> #include <asm/therm_throt.h> diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c index 70b616b4c62..ef788635324 100644 --- a/arch/x86/kernel/genapic_64.c +++ b/arch/x86/kernel/genapic_64.c @@ -30,6 +30,7 @@ extern struct genapic apic_x2apic_phys; extern struct genapic apic_x2apic_cluster; struct genapic __read_mostly *apic = &apic_flat; +EXPORT_SYMBOL_GPL(apic); static struct genapic *apic_probe[] __initdata = { #ifdef CONFIG_X86_UV diff --git a/arch/x86/kernel/probe_32.c b/arch/x86/kernel/probe_32.c index 1f701caa95b..6e31b17d546 100644 --- a/arch/x86/kernel/probe_32.c +++ b/arch/x86/kernel/probe_32.c @@ -8,6 +8,7 @@ */ #include <linux/threads.h> #include <linux/cpumask.h> +#include <linux/module.h> #include <linux/string.h> #include <linux/kernel.h> #include <linux/ctype.h> @@ -143,6 +144,7 @@ extern struct genapic apic_es7000; extern struct genapic apic_default; struct genapic *apic = &apic_default; +EXPORT_SYMBOL_GPL(apic); static struct genapic *apic_probe[] __initdata = { #ifdef CONFIG_X86_NUMAQ diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 202864ad49a..a32a5c7a8ef 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c @@ -19,7 +19,7 @@ #include <linux/cpu.h> #include <asm/nmi.h> #include <asm/msr.h> -#include <asm/apic.h> +#include <asm/genapic.h> #include "op_counter.h" #include "op_x86_model.h" diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c index 4c4a51c90bc..09a237bc9ef 100644 --- a/arch/x86/oprofile/op_model_p4.c +++ b/arch/x86/oprofile/op_model_p4.c @@ -14,7 +14,7 @@ #include <linux/nmi.h> #include <asm/msr.h> #include <asm/fixmap.h> -#include <asm/apic.h> +#include <asm/genapic.h> #include "op_x86_model.h" diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c index e9f80c744cf..5ebd8f605d7 100644 --- a/arch/x86/oprofile/op_model_ppro.c +++ b/arch/x86/oprofile/op_model_ppro.c @@ -16,7 +16,7 @@ #include <linux/slab.h> #include <asm/ptrace.h> #include <asm/msr.h> -#include <asm/apic.h> +#include <asm/genapic.h> #include <asm/nmi.h> #include <asm/intel_arch_perfmon.h> |