Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Misc fixes: three build fixes, an unwinder fix and a microcode loader
fix"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/microcode/AMD: Fix more fallout from CONFIG_RANDOMIZE_MEMORY=y
x86: Fix export for mcount and __fentry__
x86/quirks: Hide maybe-uninitialized warning
x86/build: Fix build with older GCC versions
x86/unwind: Fix empty stack dereference in guess unwinder
+14
-7
+2
-2
arch/x86/entry/Makefile
+2
-2
arch/x86/entry/Makefile
···
5
5
OBJECT_FILES_NON_STANDARD_entry_$(BITS).o := y
6
6
OBJECT_FILES_NON_STANDARD_entry_64_compat.o := y
7
7
8
-
CFLAGS_syscall_64.o += -Wno-override-init
9
-
CFLAGS_syscall_32.o += -Wno-override-init
8
+
CFLAGS_syscall_64.o += $(call cc-option,-Wno-override-init,)
9
+
CFLAGS_syscall_32.o += $(call cc-option,-Wno-override-init,)
10
10
obj-y := entry_$(BITS).o thunk_$(BITS).o syscall_$(BITS).o
11
11
obj-y += common.o
12
12
+1
-1
arch/x86/kernel/cpu/microcode/amd.c
+1
-1
arch/x86/kernel/cpu/microcode/amd.c
+2
-1
arch/x86/kernel/mcount_64.S
+2
-1
arch/x86/kernel/mcount_64.S
···
18
18
19
19
#ifdef CC_USING_FENTRY
20
20
# define function_hook __fentry__
21
+
EXPORT_SYMBOL(__fentry__)
21
22
#else
22
23
# define function_hook mcount
24
+
EXPORT_SYMBOL(mcount)
23
25
#endif
24
26
25
27
/* All cases save the original rbp (8 bytes) */
···
297
295
jmp fgraph_trace
298
296
END(function_hook)
299
297
#endif /* CONFIG_DYNAMIC_FTRACE */
300
-
EXPORT_SYMBOL(function_hook)
301
298
#endif /* CONFIG_FUNCTION_TRACER */
302
299
303
300
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
+1
-2
arch/x86/kernel/quirks.c
+1
-2
arch/x86/kernel/quirks.c
···
625
625
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F3,
626
626
amd_disable_seq_and_redirect_scrub);
627
627
628
-
#endif
629
-
630
628
#if defined(CONFIG_X86_64) && defined(CONFIG_X86_MCE)
631
629
#include <linux/jump_label.h>
632
630
#include <asm/string_64.h>
···
654
656
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2fc0, quirk_intel_brickland_xeon_ras_cap);
655
657
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fc0, quirk_intel_brickland_xeon_ras_cap);
656
658
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2083, quirk_intel_purley_xeon_ras_cap);
659
+
#endif
657
660
#endif
+8
-1
arch/x86/kernel/unwind_guess.c
+8
-1
arch/x86/kernel/unwind_guess.c
···
47
47
get_stack_info(first_frame, state->task, &state->stack_info,
48
48
&state->stack_mask);
49
49
50
-
if (!__kernel_text_address(*first_frame))
50
+
/*
51
+
* The caller can provide the address of the first frame directly
52
+
* (first_frame) or indirectly (regs->sp) to indicate which stack frame
53
+
* to start unwinding at. Skip ahead until we reach it.
54
+
*/
55
+
if (!unwind_done(state) &&
56
+
(!on_stack(&state->stack_info, first_frame, sizeof(long)) ||
57
+
!__kernel_text_address(*first_frame)))
51
58
unwind_next_frame(state);
52
59
}
53
60
EXPORT_SYMBOL_GPL(__unwind_start);