Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-13 01:08:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

x86, apic: fix build fallout of genapic changes

Browse Source 
- 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>
This commit is contained in:
Ingo Molnar 2009-02-17 12:33:20 +01:00
parent c1eeb2de41
commit 7d01d32d3b
7 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/Kconfig
View File

@ -316,6 +316,7 @@ config X86_UV
bool "SGI Ultraviolet" bool "SGI Ultraviolet"
depends on X86_64 depends on X86_64
depends on X86_EXTENDED_PLATFORM depends on X86_EXTENDED_PLATFORM
select X86_X2APIC
---help--- ---help---
This option is needed in order to support SGI Ultraviolet systems. This option is needed in order to support SGI Ultraviolet systems.
If you don't have one of these, you should say N here. If you don't have one of these, you should say N here.

2
arch/x86/kernel/cpu/mcheck/p4.c
View File

@ -11,7 +11,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/apic.h> #include <asm/genapic.h>
#include <asm/therm_throt.h> #include <asm/therm_throt.h>

1
arch/x86/kernel/genapic_64.c
View File

@ -30,6 +30,7 @@ extern struct genapic apic_x2apic_phys;
extern struct genapic apic_x2apic_cluster; extern struct genapic apic_x2apic_cluster;
struct genapic __read_mostly *apic = &apic_flat; struct genapic __read_mostly *apic = &apic_flat;
EXPORT_SYMBOL_GPL(apic);
static struct genapic *apic_probe[] __initdata = { static struct genapic *apic_probe[] __initdata = {
#ifdef CONFIG_X86_UV #ifdef CONFIG_X86_UV

2
arch/x86/kernel/probe_32.c
View File

@ -8,6 +8,7 @@
*/ */
#include <linux/threads.h> #include <linux/threads.h>
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <linux/module.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/ctype.h> #include <linux/ctype.h>
@ -143,6 +144,7 @@ extern struct genapic apic_es7000;
extern struct genapic apic_default; extern struct genapic apic_default;
struct genapic *apic = &apic_default; struct genapic *apic = &apic_default;
EXPORT_SYMBOL_GPL(apic);
static struct genapic *apic_probe[] __initdata = { static struct genapic *apic_probe[] __initdata = {
#ifdef CONFIG_X86_NUMAQ #ifdef CONFIG_X86_NUMAQ

2
arch/x86/oprofile/nmi_int.c
View File

@ -19,7 +19,7 @@
#include <linux/cpu.h> #include <linux/cpu.h>
#include <asm/nmi.h> #include <asm/nmi.h>
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/apic.h> #include <asm/genapic.h>
#include "op_counter.h" #include "op_counter.h"
#include "op_x86_model.h" #include "op_x86_model.h"

2
arch/x86/oprofile/op_model_p4.c
View File

@ -14,7 +14,7 @@
#include <linux/nmi.h> #include <linux/nmi.h>
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/fixmap.h> #include <asm/fixmap.h>
#include <asm/apic.h> #include <asm/genapic.h>
#include "op_x86_model.h" #include "op_x86_model.h"

2
arch/x86/oprofile/op_model_ppro.c
View File

@ -16,7 +16,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/apic.h> #include <asm/genapic.h>
#include <asm/nmi.h> #include <asm/nmi.h>
#include <asm/intel_arch_perfmon.h> #include <asm/intel_arch_perfmon.h>