x86 fixes for v3.14-rc4
Hi Linus,
Two very small changes: one fix for the vSMP Foundation platform, and one to help LLVM not choke on options it doesn't understand (although it probably should.)
The following changes since commit c089b229dfdd09d59a11d8bc2344bf8196d575ce:
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml (2014-04-21 10:05:35 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus
x86/vsmp: Fix irq routing (2014-04-28 09:27:34 +0200)
----------------------------------------------------------------
Behan Webster (1):
x86: LLVMLinux: Wrap -mno-80387 with cc-option
Oren Twaig (1):
x86/vsmp: Fix irq routing
arch/x86/Makefile | 4 +++- arch/x86/kernel/vsmp_64.c | 11 ++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-)
arch/x86/Makefile +3 -1
@@ -83,7 +83,9 @@ else KBUILD_CFLAGS += -m64 # Don't autogenerate traditional x87, MMX or SSE instructions - KBUILD_CFLAGS += -mno-mmx -mno-sse -mno-80387 -mno-fp-ret-in-387 + KBUILD_CFLAGS += -mno-mmx -mno-sse + KBUILD_CFLAGS += $(call cc-option,-mno-80387) + KBUILD_CFLAGS += $(call cc-option,-mno-fp-ret-in-387) # Use -mpreferred-stack-boundary=3 if supported. KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=3)
arch/x86/kernel/vsmp_64.c +10 -1
@@ -26,6 +26,9 @@#define TOPOLOGY_REGISTER_OFFSET 0x10 +/* Flag below is initialized once during vSMP PCI initialization. */ +static int irq_routing_comply =1 ; +#if definedCONFIG_PCI && definedCONFIG_PARAVIRT /* * Interrupt control on vSMPowered systems:
@@ -101,6 +104,10 @@ static void __init set_vsmp_pv_ops(void)#ifdef CONFIG_SMP if (cap & ctl &BIT (8 )) { ctl &= ~BIT (8 ); + +/* Interrupt routing set to ignore */ + irq_routing_comply =0 ; +#ifdef CONFIG_PROC_FS /* Don't let users change irq affinity via procfs */ no_irq_affinity =1 ;
@@ -218,7 +225,9 @@ static void vsmp_apic_post_init(void) {/* need to update phys_pkg_id */ apic->phys_pkg_id = apicid_phys_pkg_id; - apic->vector_allocation_domain = fill_vector_allocation_domain; + +if (!irq_routing_comply) + apic->vector_allocation_domain = fill_vector_allocation_domain; }void __init vsmp_init (void )