OSDN Git Service

x86/x2apic: Move code in conditional region
authorThomas Gleixner <tglx@linutronix.de>
Thu, 15 Jan 2015 21:22:19 +0000 (21:22 +0000)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 22 Jan 2015 14:10:54 +0000 (15:10 +0100)
commit55eae7de727e9ecc814853ec364fbbb352c337df
tree4df5ccd96f822894f95a205434e703b33daa1af0
parentd524165cb8dbb2ce5916cd7682236b9324ae2644
x86/x2apic: Move code in conditional region

No point in having try_to_enable_x2apic() outside of the
CONFIG_X86_X2APIC section and having inline functions and more ifdefs
to deal with it. Move the code into the existing ifdef section and
remove the inline cruft.

Fixup the printk about not enabling interrupt remapping as suggested
by Boris.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Link: http://lkml.kernel.org/r/20150115211702.795388613@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/include/asm/apic.h
arch/x86/kernel/apic/apic.c