diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-05-11 16:02:10 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-05-11 16:17:05 -0700 |
| commit | 99aa45595f45603526513d5e29fc00f8afbf3913 (patch) | |
| tree | 6c78891c04c10f6af014891fbbaf63c7276a5c24 /arch/x86/boot | |
| parent | 40b387a8a9a821878ecdf9fb117958c426fc1385 (diff) | |
| download | linux-99aa45595f45603526513d5e29fc00f8afbf3913.tar.gz linux-99aa45595f45603526513d5e29fc00f8afbf3913.tar.bz2 linux-99aa45595f45603526513d5e29fc00f8afbf3913.zip | |
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')
| -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) 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. */ 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) 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 */ |