diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-05-11 19:02:10 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-05-11 19:17:05 -0400 |
commit | 99aa45595f45603526513d5e29fc00f8afbf3913 (patch) | |
tree | 6c78891c04c10f6af014891fbbaf63c7276a5c24 /arch/x86/boot/compressed | |
parent | 40b387a8a9a821878ecdf9fb117958c426fc1385 (diff) |
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>
Diffstat (limited to 'arch/x86/boot/compressed')
-rw-r--r-- | arch/x86/boot/compressed/head_32.S | 10 | ||||
-rw-r--r-- | arch/x86/boot/compressed/head_64.S | 2 |
2 files changed, 0 insertions, 12 deletions
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 | |||
@@ -100,16 +100,6 @@ ENTRY(startup_32) | |||
100 | popl %esi | 100 | popl %esi |
101 | 101 | ||
102 | /* | 102 | /* |
103 | * Compute the kernel start address. | ||
104 | */ | ||
105 | #ifdef CONFIG_RELOCATABLE | ||
106 | addl $(CONFIG_PHYSICAL_ALIGN - 1), %ebp | ||
107 | andl $(~(CONFIG_PHYSICAL_ALIGN - 1)), %ebp | ||
108 | #else | ||
109 | movl $LOAD_PHYSICAL_ADDR, %ebp | ||
110 | #endif | ||
111 | |||
112 | /* | ||
113 | * Jump to the relocated address. | 103 | * Jump to the relocated address. |
114 | */ | 104 | */ |
115 | leal relocated(%ebx), %eax | 105 | leal relocated(%ebx), %eax |
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) | |||
226 | leaq startup_32(%rip) /* - $startup_32 */, %rbp | 226 | leaq startup_32(%rip) /* - $startup_32 */, %rbp |
227 | addq $(PMD_PAGE_SIZE - 1), %rbp | 227 | addq $(PMD_PAGE_SIZE - 1), %rbp |
228 | andq $PMD_PAGE_MASK, %rbp | 228 | andq $PMD_PAGE_MASK, %rbp |
229 | movq %rbp, %rbx | ||
230 | #else | 229 | #else |
231 | movq $LOAD_PHYSICAL_ADDR, %rbp | 230 | movq $LOAD_PHYSICAL_ADDR, %rbp |
232 | movq %rbp, %rbx | ||
233 | #endif | 231 | #endif |
234 | 232 | ||
235 | /* Target address to relocate to for decompression */ | 233 | /* Target address to relocate to for decompression */ |