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 Thomas Gleixner:
"A small set of x86 fixes:
- prevent the kernel from using the EFI reboot method when EFI is
disabled.
- two patches addressing clang issues"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/boot: Disable the address-of-packed-member compiler warning
x86/efi: Fix reboot_mode when EFI runtime services are disabled
x86/boot: #undef memcpy() et al in string.c
+13
-3
+1
arch/x86/boot/compressed/Makefile
+1
arch/x86/boot/compressed/Makefile
···
34
34
KBUILD_CFLAGS += -mno-mmx -mno-sse
35
35
KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
36
36
KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
37
+
KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)
37
38
38
39
KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
39
40
GCOV_PROFILE := n
+9
arch/x86/boot/string.c
+9
arch/x86/boot/string.c
···
16
16
#include "ctype.h"
17
17
#include "string.h"
18
18
19
+
/*
20
+
* Undef these macros so that the functions that we provide
21
+
* here will have the correct names regardless of how string.h
22
+
* may have chosen to #define them.
23
+
*/
24
+
#undef memcpy
25
+
#undef memset
26
+
#undef memcmp
27
+
19
28
int memcmp(const void *s1, const void *s2, size_t len)
20
29
{
21
30
bool diff;
+3
-3
arch/x86/kernel/reboot.c
+3
-3
arch/x86/kernel/reboot.c
···
471
471
472
472
/*
473
473
* The DMI quirks table takes precedence. If no quirks entry
474
-
* matches and the ACPI Hardware Reduced bit is set, force EFI
475
-
* reboot.
474
+
* matches and the ACPI Hardware Reduced bit is set and EFI
475
+
* runtime services are enabled, force EFI reboot.
476
476
*/
477
477
rv = dmi_check_system(reboot_dmi_table);
478
478
479
-
if (!rv && efi_reboot_required())
479
+
if (!rv && efi_reboot_required() && !efi_runtime_disabled())
480
480
reboot_type = BOOT_EFI;
481
481
482
482
return 0;