x86, boot: use LOAD_PHYSICAL_ADDR on 64 bits

Use LOAD_PHYSICAL_ADDR instead of CONFIG_PHYSICAL_START in the 64-bit
decompression code, for equivalence with the 32-bit code.

[ Impact: cleanup, increases code similarity ]

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index 2b9f2510507b..4135d438b662 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/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