x86/boot changes for v4.15
Linus,
Please pull the latest x86-boot-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-boot-for-linus
# HEAD: 6c3b56b1973083e2bb4e87eb90ea5368455706dc x86/boot: Disable Clang warnings about GNU extensions
Three smaller changes:
- clang fix
- boot message beautification
- unnecessary header inclusion removal
Thanks,
Ingo
------------------>
Jean Delvare (1):
x86/boot: Spell out "boot CPU" for BP
Masahiro Yamada (1):
x86/boot: Remove unnecessary #include <generated/utsrelease.h>
Matthias Kaehlcke (1):
x86/boot: Disable Clang warnings about GNU extensions
arch/x86/boot/compressed/Makefile | 1 + arch/x86/boot/header.S | 1 - arch/x86/include/asm/mpspec_def.h | 2 +- arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/cpu/common.c | 4 ++-- arch/x86/kernel/setup.c | 2 +- arch/x86/kernel/smpboot.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)
arch/x86/boot/compressed/Makefile +1 -0
@@ -35,6 +35,7 @@ KBUILD_CFLAGS += -mno-mmx -mno-sse KBUILD_CFLAGS += $(call cc-option,-ffreestanding) KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector) KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) +KBUILD_CFLAGS += $(call cc-disable-warning, gnu) KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ GCOV_PROFILE := n
arch/x86/boot/header.S +0 -1
@@ -16,7 +16,6 @@ */ #include <asm/segment.h> -#include <generated/utsrelease.h> #include <asm/boot.h> #include <asm/page_types.h> #include <asm/setup.h>
arch/x86/include/asm/mpspec_def.h +1 -1
@@ -58,7 +58,7 @@ struct mpc_table {#define MP_TRANSLATION 192#define CPU_ENABLED 1/* Processor is available */ -#define CPU_BOOTPROCESSOR 2/* Processor is the BP */ +#define CPU_BOOTPROCESSOR 2/* Processor is the boot CPU */ #define CPU_STEPPING_MASK 0x000F#define CPU_MODEL_MASK 0x00F0
arch/x86/kernel/apic/apic.c +1 -1
@@ -1462,7 +1462,7 @@ void setup_local_APIC(void)/* * Set up LVT0, LVT1: * -* set up through-local-APIC on the BP's LINT0. This is not +* set up through-local-APIC on the boot CPU's LINT0. This is not * strictly necessary in pure symmetric-IO mode, but sometimes * we delegate interrupts to the 8259A. */
arch/x86/kernel/cpu/common.c +2 -2
@@ -863,8 +863,8 @@ static void identify_cpu_without_cpuid(struct cpuinfo_x86 *c)* cache alignment. * The others are not touched to avoid unwanted side effects. * -* WARNING: this function is only called on the BP. Don't add code here -* that is supposed to run on all CPUs. +* WARNING: this function is only called on the boot CPU. Don't add code +* here that is supposed to run on all CPUs. */ static void __init early_identify_cpu (struct cpuinfo_x86 *c) {
arch/x86/kernel/setup.c +1 -1
@@ -1045,7 +1045,7 @@ void __init setup_arch(char **cmdline_p)/* * VMware detection requires dmi to be available, so this -* needs to be done after dmi_scan_machine, for the BP. +* needs to be done after dmi_scan_machine(), for the boot CPU. */ init_hypervisor_platform ();
arch/x86/kernel/smpboot.c +1 -1
@@ -249,7 +249,7 @@ static void notrace start_secondary(void *unused)/* otherwise gcc will move up smp_processor_id before the cpu_init */ barrier ();/* -* Check TSC synchronization with the BP: +* Check TSC synchronization with the boot CPU: */ check_tsc_sync_target ();