lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, boot: use LOAD_PHYSICAL_ADDR on 64 bits

Browse Source 
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>
This commit is contained in:
H. Peter Anvin
2009-05-11 14:41:55 -07:00
parent 77d1a49995
commit 40b387a8a9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/boot/compressed/head_64.S
View File

@@ -87,7 +87,7 @@ ENTRY(startup_32)
addl $(PMD_PAGE_SIZE -1), %ebx addl $(PMD_PAGE_SIZE -1), %ebx
andl $PMD_PAGE_MASK, %ebx andl $PMD_PAGE_MASK, %ebx
#else #else
movl $CONFIG_PHYSICAL_START, %ebx movl $LOAD_PHYSICAL_ADDR, %ebx
#endif #endif
/* Target address to relocate to for decompression */ /* 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 * If it is a relocatable kernel then decompress and run the kernel
* from load address aligned to 2MB addr, otherwise decompress and * 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 * We cannot rely on the calculation done in 32-bit mode, since we
* may have been invoked via the 64-bit entry point. * may have been invoked via the 64-bit entry point.
@@ -228,7 +228,7 @@ ENTRY(startup_64)
andq $PMD_PAGE_MASK, %rbp andq $PMD_PAGE_MASK, %rbp
movq %rbp, %rbx movq %rbp, %rbx
#else #else
movq $CONFIG_PHYSICAL_START, %rbp movq $LOAD_PHYSICAL_ADDR, %rbp
movq %rbp, %rbx movq %rbp, %rbx
#endif #endif