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>
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

View File

@ -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.

View File

@ -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>

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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"

View File

@ -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>