---

yaml --- r: 145690 b: refs/heads/master c: 99aa455 h: refs/heads/master v: v3
git-mirror · May 11, 2009 · c3eba1f · c3eba1f
1 parent 63092e0
commit c3eba1f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40b387a8a9a821878ecdf9fb117958c426fc1385
+refs/heads/master: 99aa45595f45603526513d5e29fc00f8afbf3913
diff --git a/trunk/arch/x86/boot/compressed/head_32.S b/trunk/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/trunk/arch/x86/boot/compressed/head_64.S b/trunk/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 */