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

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

Pull x86 boot updates from Ingo Molnar:
"Three smaller changes:

- clang fix

- boot message beautification

- unnecessary header inclusion removal"

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/boot: Disable Clang warnings about GNU extensions
x86/boot: Remove unnecessary #include <generated/utsrelease.h>
x86/boot: Spell out "boot CPU" for BP

+7 -7
+1
arch/x86/boot/compressed/Makefile
··· 36 36 KBUILD_CFLAGS += $(call cc-option,-ffreestanding) 37 37 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector) 38 38 KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) 39 + KBUILD_CFLAGS += $(call cc-disable-warning, gnu) 39 40 40 41 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ 41 42 GCOV_PROFILE := n
-1
arch/x86/boot/header.S
··· 17 17 */ 18 18 19 19 #include <asm/segment.h> 20 - #include <generated/utsrelease.h> 21 20 #include <asm/boot.h> 22 21 #include <asm/page_types.h> 23 22 #include <asm/setup.h>
+1 -1
arch/x86/include/asm/mpspec_def.h
··· 59 59 #define MP_TRANSLATION 192 60 60 61 61 #define CPU_ENABLED 1 /* Processor is available */ 62 - #define CPU_BOOTPROCESSOR 2 /* Processor is the BP */ 62 + #define CPU_BOOTPROCESSOR 2 /* Processor is the boot CPU */ 63 63 64 64 #define CPU_STEPPING_MASK 0x000F 65 65 #define CPU_MODEL_MASK 0x00F0
+1 -1
arch/x86/kernel/apic/apic.c
··· 1473 1473 /* 1474 1474 * Set up LVT0, LVT1: 1475 1475 * 1476 - * set up through-local-APIC on the BP's LINT0. This is not 1476 + * set up through-local-APIC on the boot CPU's LINT0. This is not 1477 1477 * strictly necessary in pure symmetric-IO mode, but sometimes 1478 1478 * we delegate interrupts to the 8259A. 1479 1479 */
+2 -2
arch/x86/kernel/cpu/common.c
··· 885 885 * cache alignment. 886 886 * The others are not touched to avoid unwanted side effects. 887 887 * 888 - * WARNING: this function is only called on the BP. Don't add code here 889 - * that is supposed to run on all CPUs. 888 + * WARNING: this function is only called on the boot CPU. Don't add code 889 + * here that is supposed to run on all CPUs. 890 890 */ 891 891 static void __init early_identify_cpu(struct cpuinfo_x86 *c) 892 892 {
+1 -1
arch/x86/kernel/setup.c
··· 1047 1047 1048 1048 /* 1049 1049 * VMware detection requires dmi to be available, so this 1050 - * needs to be done after dmi_scan_machine, for the BP. 1050 + * needs to be done after dmi_scan_machine(), for the boot CPU. 1051 1051 */ 1052 1052 init_hypervisor_platform(); 1053 1053
+1 -1
arch/x86/kernel/smpboot.c
··· 251 251 /* otherwise gcc will move up smp_processor_id before the cpu_init */ 252 252 barrier(); 253 253 /* 254 - * Check TSC synchronization with the BP: 254 + * Check TSC synchronization with the boot CPU: 255 255 */ 256 256 check_tsc_sync_target(); 257 257