Skip to content

Commit 40b387a

Browse files
author
H. Peter Anvin
committed
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 <[email protected]>
1 parent 77d1a49 commit 40b387a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/x86/boot/compressed/head_64.S

+3-3
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ ENTRY(startup_32)
8787
addl $(PMD_PAGE_SIZE -1), %ebx
8888
andl $PMD_PAGE_MASK, %ebx
8989
#else
90-
movl $CONFIG_PHYSICAL_START, %ebx
90+
movl $LOAD_PHYSICAL_ADDR, %ebx
9191
#endif
9292

9393
/* Target address to relocate to for decompression */
@@ -215,7 +215,7 @@ ENTRY(startup_64)
215215
*
216216
* If it is a relocatable kernel then decompress and run the kernel
217217
* from load address aligned to 2MB addr, otherwise decompress and
218-
* run the kernel from CONFIG_PHYSICAL_START
218+
* run the kernel from LOAD_PHYSICAL_ADDR
219219
*
220220
* We cannot rely on the calculation done in 32-bit mode, since we
221221
* may have been invoked via the 64-bit entry point.
@@ -228,7 +228,7 @@ ENTRY(startup_64)
228228
andq $PMD_PAGE_MASK, %rbp
229229
movq %rbp, %rbx
230230
#else
231-
movq $CONFIG_PHYSICAL_START, %rbp
231+
movq $LOAD_PHYSICAL_ADDR, %rbp
232232
movq %rbp, %rbx
233233
#endif
234234

0 commit comments

Comments
 (0)