aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-17 06:33:20 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-17 07:13:25 -0500
commit7d01d32d3b9becd6deba318b718db3d9fc181d23 (patch)
tree70f866bac39065812cd81d298a9bf16e8b60a449 /arch/x86
parentc1eeb2de41d7015678bdd412b48a5f071b84e29a (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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/Kconfig1
-rw-r--r--arch/x86/kernel/cpu/mcheck/p4.c2
-rw-r--r--arch/x86/kernel/genapic_64.c1
-rw-r--r--arch/x86/kernel/probe_32.c2
-rw-r--r--arch/x86/oprofile/nmi_int.c2
-rw-r--r--arch/x86/oprofile/op_model_p4.c2
-rw-r--r--arch/x86/oprofile/op_model_ppro.c2
7 files changed, 8 insertions, 4 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index bce241fe1d2d..8955262caa34 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -316,6 +316,7 @@ config X86_UV
316 bool "SGI Ultraviolet" 316 bool "SGI Ultraviolet"
317 depends on X86_64 317 depends on X86_64
318 depends on X86_EXTENDED_PLATFORM 318 depends on X86_EXTENDED_PLATFORM
319 select X86_X2APIC
319 ---help--- 320 ---help---
320 This option is needed in order to support SGI Ultraviolet systems. 321 This option is needed in order to support SGI Ultraviolet systems.
321 If you don't have one of these, you should say N here. 322 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 9b60fce09f75..f9c92b66dfbe 100644
--- a/arch/x86/kernel/cpu/mcheck/p4.c
+++ b/arch/x86/kernel/cpu/mcheck/p4.c
@@ -11,7 +11,7 @@
11#include <asm/processor.h> 11#include <asm/processor.h>
12#include <asm/system.h> 12#include <asm/system.h>
13#include <asm/msr.h> 13#include <asm/msr.h>
14#include <asm/apic.h> 14#include <asm/genapic.h>
15 15
16#include <asm/therm_throt.h> 16#include <asm/therm_throt.h>
17 17
diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c
index 70b616b4c629..ef7886353240 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;
30extern struct genapic apic_x2apic_cluster; 30extern struct genapic apic_x2apic_cluster;
31 31
32struct genapic __read_mostly *apic = &apic_flat; 32struct genapic __read_mostly *apic = &apic_flat;
33EXPORT_SYMBOL_GPL(apic);
33 34
34static struct genapic *apic_probe[] __initdata = { 35static struct genapic *apic_probe[] __initdata = {
35#ifdef CONFIG_X86_UV 36#ifdef CONFIG_X86_UV
diff --git a/arch/x86/kernel/probe_32.c b/arch/x86/kernel/probe_32.c
index 1f701caa95bc..6e31b17d546d 100644
--- a/arch/x86/kernel/probe_32.c
+++ b/arch/x86/kernel/probe_32.c
@@ -8,6 +8,7 @@
8 */ 8 */
9#include <linux/threads.h> 9#include <linux/threads.h>
10#include <linux/cpumask.h> 10#include <linux/cpumask.h>
11#include <linux/module.h>
11#include <linux/string.h> 12#include <linux/string.h>
12#include <linux/kernel.h> 13#include <linux/kernel.h>
13#include <linux/ctype.h> 14#include <linux/ctype.h>
@@ -143,6 +144,7 @@ extern struct genapic apic_es7000;
143extern struct genapic apic_default; 144extern struct genapic apic_default;
144 145
145struct genapic *apic = &apic_default; 146struct genapic *apic = &apic_default;
147EXPORT_SYMBOL_GPL(apic);
146 148
147static struct genapic *apic_probe[] __initdata = { 149static struct genapic *apic_probe[] __initdata = {
148#ifdef CONFIG_X86_NUMAQ 150#ifdef CONFIG_X86_NUMAQ
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 202864ad49a7..a32a5c7a8ef6 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -19,7 +19,7 @@
19#include <linux/cpu.h> 19#include <linux/cpu.h>
20#include <asm/nmi.h> 20#include <asm/nmi.h>
21#include <asm/msr.h> 21#include <asm/msr.h>
22#include <asm/apic.h> 22#include <asm/genapic.h>
23 23
24#include "op_counter.h" 24#include "op_counter.h"
25#include "op_x86_model.h" 25#include "op_x86_model.h"
diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c
index 4c4a51c90bc2..09a237bc9ef6 100644
--- a/arch/x86/oprofile/op_model_p4.c
+++ b/arch/x86/oprofile/op_model_p4.c
@@ -14,7 +14,7 @@
14#include <linux/nmi.h> 14#include <linux/nmi.h>
15#include <asm/msr.h> 15#include <asm/msr.h>
16#include <asm/fixmap.h> 16#include <asm/fixmap.h>
17#include <asm/apic.h> 17#include <asm/genapic.h>
18 18
19 19
20#include "op_x86_model.h" 20#include "op_x86_model.h"
diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
index e9f80c744cf3..5ebd8f605d76 100644
--- a/arch/x86/oprofile/op_model_ppro.c
+++ b/arch/x86/oprofile/op_model_ppro.c
@@ -16,7 +16,7 @@
16#include <linux/slab.h> 16#include <linux/slab.h>
17#include <asm/ptrace.h> 17#include <asm/ptrace.h>
18#include <asm/msr.h> 18#include <asm/msr.h>
19#include <asm/apic.h> 19#include <asm/genapic.h>
20#include <asm/nmi.h> 20#include <asm/nmi.h>
21#include <asm/intel_arch_perfmon.h> 21#include <asm/intel_arch_perfmon.h>
22 22