Commit 9589351c 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:
 "Misc cleanups and small enhancements all around the map"

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/boot/compressed: Fix debug_puthex() parameter type
  x86/setup: Fix static memory detection
  x86/vmlinux: Drop unneeded linker script discard of .eh_frame
  x86/*/Makefile: Use -fno-asynchronous-unwind-tables to suppress .eh_frame sections
  x86/boot/compressed: Remove .eh_frame section from bzImage
  x86/boot/compressed/64: Remove .bss/.pgtable from bzImage
  x86/boot/compressed/64: Use 32-bit (zero-extended) MOV for z_output_len
  x86/boot/compressed/64: Use LEA to initialize boot stack pointer
parents 3cd86a58 c90beea2

arch/x86/boot/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ clean-files += cpustr.h 
KBUILD_CFLAGS	:= $(REALMODE_CFLAGS) -D_SETUP

KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__

KBUILD_CFLAGS	+= $(call cc-option,-fmacro-prefix-map=$(srctree)/=)

KBUILD_CFLAGS	+= -fno-asynchronous-unwind-tables

GCOV_PROFILE := n

UBSAN_SANITIZE := n

arch/x86/boot/compressed/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) 
KBUILD_CFLAGS += $(call cc-disable-warning, gnu)

KBUILD_CFLAGS += -Wno-pointer-sign

KBUILD_CFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=)

KBUILD_CFLAGS += -fno-asynchronous-unwind-tables



KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__

GCOV_PROFILE := n

arch/x86/boot/compressed/head_64.S

+2 −2
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ SYM_FUNC_START_LOCAL_NOALIGN(.Lrelocated) 
	leaq	input_data(%rip), %rdx  /* input_data */

	movl	$z_input_len, %ecx	/* input_len */

	movq	%rbp, %r8		/* output target address */

	movq	$z_output_len, %r9	/* decompressed length, end of relocs */

	movl	$z_output_len, %r9d	/* decompressed length, end of relocs */

	call	extract_kernel		/* returns kernel location in %rax */

	popq	%rsi
@@ -780,7 +780,7 @@ SYM_DATA_END_LABEL(boot_stack, SYM_L_LOCAL, boot_stack_end) 
/*

 * Space for page tables (not in .bss so not zeroed)

 */

	.section ".pgtable","a",@nobits

	.section ".pgtable","aw",@nobits

	.balign 4096

SYM_DATA_LOCAL(pgtable,		.fill BOOT_PGT_SIZE, 1, 0)

arch/x86/boot/compressed/misc.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ void __puthex(unsigned long value); 


static inline void debug_putstr(const char *s)

{ }

static inline void debug_puthex(const char *s)

static inline void debug_puthex(unsigned long value)

{ }

#define debug_putaddr(x) /* */

arch/x86/boot/setup.ld

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ SECTIONS 
	_end = .;



	/DISCARD/	: {

		*(.eh_frame)

		*(.note*)

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE