summaryrefslogtreecommitdiffstats
path: root/arch/x86/oprofile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-17 12:33:20 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-17 13:13:25 +0100
commit7d01d32d3b9becd6deba318b718db3d9fc181d23 (patch)
tree70f866bac39065812cd81d298a9bf16e8b60a449 /arch/x86/oprofile
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/oprofile')
-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
3 files changed, 3 insertions, 3 deletions
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>