From: H. Peter Anvin <hpa@zytor.com>
Date: Mon, 11 May 2009 23:02:10 +0000 (-0700)
Subject: x86, boot: remove dead code from boot/compressed/head_*.S
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=99aa45595f45603526513d5e29fc00f8afbf3913;p=linux-beck.git

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>
---

diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
index 470474bafc4d..2b8e0dfa4b27 100644
--- a/arch/x86/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
@@ -99,16 +99,6 @@ ENTRY(startup_32)
 	cld
 	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.
  */
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index 4135d438b662..2bb500af1bd7 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -226,10 +226,8 @@ ENTRY(startup_64)
 	leaq	startup_32(%rip) /* - $startup_32 */, %rbp
 	addq	$(PMD_PAGE_SIZE - 1), %rbp
 	andq	$PMD_PAGE_MASK, %rbp
-	movq	%rbp, %rbx
 #else
 	movq	$LOAD_PHYSICAL_ADDR, %rbp
-	movq	%rbp, %rbx
 #endif
 
 	/* Target address to relocate to for decompression */