summaryrefslogtreecommitdiffstats
path: root/arch/x86/boot
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-05-11 14:41:55 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-05-11 14:41:55 -0700
commit40b387a8a9a821878ecdf9fb117958c426fc1385 (patch)
tree28a8886b89faa4da5cfce32a5115e0a10f49c04e /arch/x86/boot
parent77d1a4999502c260df0eb2de437d320bf8c64b36 (diff)
downloadop-kernel-dev-40b387a8a9a821878ecdf9fb117958c426fc1385.zip
op-kernel-dev-40b387a8a9a821878ecdf9fb117958c426fc1385.tar.gz
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>
Diffstat (limited to 'arch/x86/boot')
-rw-r--r--arch/x86/boot/compressed/head_64.S6
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 2b9f251..4135d43 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
OpenPOWER on IntegriCloud