From 63092e033e8a113469d51291e05fcc4df9e36076 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Mon, 11 May 2009 14:41:55 -0700
Subject: [PATCH] --- yaml --- r: 145689 b: refs/heads/master c:
 40b387a8a9a821878ecdf9fb117958c426fc1385 h: refs/heads/master i:   145687:
 292f712c5715cdf99091e2d54554bea8a2d06ca5 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/x86/boot/compressed/head_64.S | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7e92e03a71bc..d410d9479424 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77d1a4999502c260df0eb2de437d320bf8c64b36
+refs/heads/master: 40b387a8a9a821878ecdf9fb117958c426fc1385
diff --git a/trunk/arch/x86/boot/compressed/head_64.S b/trunk/arch/x86/boot/compressed/head_64.S
index 2b9f2510507b..4135d438b662 100644
--- a/trunk/arch/x86/boot/compressed/head_64.S
+++ b/trunk/arch/x86/boot/compressed/head_64.S
@@ -87,7 +87,7 @@ ENTRY(startup_32)
 	addl	$(PMD_PAGE_SIZE -1), %ebx
 	andl	$PMD_PAGE_MASK, %ebx
 #else
-	movl	$CONFIG_PHYSICAL_START, %ebx
+	movl	$LOAD_PHYSICAL_ADDR, %ebx
 #endif
 
 	/* Target address to relocate to for decompression */
@@ -215,7 +215,7 @@ ENTRY(startup_64)
 	 *
 	 * If it is a relocatable kernel then decompress and run the kernel
 	 * from load address aligned to 2MB addr, otherwise decompress and
-	 * run the kernel from CONFIG_PHYSICAL_START
+	 * run the kernel from LOAD_PHYSICAL_ADDR
 	 *
 	 * We cannot rely on the calculation done in 32-bit mode, since we
 	 * may have been invoked via the 64-bit entry point.
@@ -228,7 +228,7 @@ ENTRY(startup_64)
 	andq	$PMD_PAGE_MASK, %rbp
 	movq	%rbp, %rbx
 #else
-	movq	$CONFIG_PHYSICAL_START, %rbp
+	movq	$LOAD_PHYSICAL_ADDR, %rbp
 	movq	%rbp, %rbx
 #endif