Commit 7d01d32d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
parent c1eeb2de

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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.

arch/x86/kernel/cpu/mcheck/p4.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/x86/kernel/genapic_64.c

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/x86/kernel/probe_32.c

+2 −0
Original line number Diff line number Diff line
@@ -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

arch/x86/oprofile/nmi_int.c

+1 −1
Original line number Diff line number Diff line
@@ -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"