Commit 6a9f70b0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d6ec9d9a 6c3b56b1

arch/x86/boot/compressed/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,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
Original line number Diff line number Diff line
@@ -17,7 +17,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
Original line number Diff line number Diff line
@@ -59,7 +59,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
Original line number Diff line number Diff line
@@ -1473,7 +1473,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
Original line number Diff line number Diff line
@@ -885,8 +885,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)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE