Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99aa4559 authored May 11, 2009 by H. Peter Anvin

x86, boot: remove dead code from boot/compressed/head_*.S



Remove a couple of lines of dead code from
arch/x86/boot/compressed/head_*.S; all of these update registers that
are dead in the current code.

[ Impact: cleanup ]

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

parent 40b387a8

arch/x86/boot/compressed/head_32.S

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -99,16 +99,6 @@ ENTRY(startup_32)
	cld		cld
	popl %esi		popl %esi

	/*
	* Compute the kernel start address.
	*/
	#ifdef CONFIG_RELOCATABLE
	addl $(CONFIG_PHYSICAL_ALIGN - 1), %ebp
	andl $(~(CONFIG_PHYSICAL_ALIGN - 1)), %ebp
	#else
	movl $LOAD_PHYSICAL_ADDR, %ebp
	#endif

	/*		/*
	* Jump to the relocated address.		* Jump to the relocated address.
	*/		*/

arch/x86/boot/compressed/head_64.S

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -226,10 +226,8 @@ ENTRY(startup_64)
	leaq startup_32(%rip) /* - $startup_32 */, %rbp		leaq startup_32(%rip) /* - $startup_32 */, %rbp
	addq $(PMD_PAGE_SIZE - 1), %rbp		addq $(PMD_PAGE_SIZE - 1), %rbp
	andq $PMD_PAGE_MASK, %rbp		andq $PMD_PAGE_MASK, %rbp
	movq %rbp, %rbx
	#else		#else
	movq $LOAD_PHYSICAL_ADDR, %rbp		movq $LOAD_PHYSICAL_ADDR, %rbp
	movq %rbp, %rbx
	#endif		#endif

	/* Target address to relocate to for decompression */		/* Target address to relocate to for decompression */