tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:
"Two UV platform fixes, and a kbuild fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/platform/UV: Fix critical UV MMR address error
x86/platform/uv/BAU: Add APIC idt entry
x86/purgatory: Avoid creating stray .<pid>.d files, remove -MD from KBUILD_CFLAGS

Linus Torvalds ad0500ca 93e04d4a

options
unified split
Changed files
+6 -4
arch
x86
include
asm
hw_irq.h
uv
uv_mmrs.h
kernel
idt.c
platform
uv
tlb_uv.c
purgatory
Makefile
+1
arch/x86/include/asm/hw_irq.h
··· 36 36 extern asmlinkage void kvm_posted_intr_nested_ipi(void); 37 37 extern asmlinkage void error_interrupt(void); 38 38 extern asmlinkage void irq_work_interrupt(void); 39 + extern asmlinkage void uv_bau_message_intr1(void); 39 40 40 41 extern asmlinkage void spurious_interrupt(void); 41 42 extern asmlinkage void thermal_interrupt(void);
+1 -1
arch/x86/include/asm/uv/uv_mmrs.h
··· 3833 3833 #define UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR uv_undefined("UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR") 3834 3834 #define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR uv_undefined("UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR") 3835 3835 #define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR 0x1603000UL 3836 - #define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR 0x483000UL 3836 + #define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR 0x484000UL 3837 3837 #define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR ( \ 3838 3838 is_uv1_hub() ? UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR : \ 3839 3839 is_uv2_hub() ? UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR : \
+3
arch/x86/kernel/idt.c
··· 140 140 # ifdef CONFIG_IRQ_WORK 141 141 INTG(IRQ_WORK_VECTOR, irq_work_interrupt), 142 142 # endif 143 + #ifdef CONFIG_X86_UV 144 + INTG(UV_BAU_MESSAGE, uv_bau_message_intr1), 145 + #endif 143 146 INTG(SPURIOUS_APIC_VECTOR, spurious_interrupt), 144 147 INTG(ERROR_APIC_VECTOR, error_interrupt), 145 148 #endif
-2
arch/x86/platform/uv/tlb_uv.c
··· 2255 2255 init_uvhub(uvhub, vector, uv_base_pnode); 2256 2256 } 2257 2257 2258 - alloc_intr_gate(vector, uv_bau_message_intr1); 2259 - 2260 2258 for_each_possible_blade(uvhub) { 2261 2259 if (uv_blade_nr_possible_cpus(uvhub)) { 2262 2260 unsigned long val;
+1 -1
arch/x86/purgatory/Makefile
··· 16 16 # in turn leaves some undefined symbols like __fentry__ in purgatory and not 17 17 # sure how to relocate those. Like kexec-tools, use custom flags. 18 18 19 - KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes -fno-zero-initialized-in-bss -fno-builtin -ffreestanding -c -MD -Os -mcmodel=large 19 + KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes -fno-zero-initialized-in-bss -fno-builtin -ffreestanding -c -Os -mcmodel=large 20 20 KBUILD_CFLAGS += -m$(BITS) 21 21 KBUILD_CFLAGS += $(call cc-option,-fno-PIE) 22 22