diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/boot/compressed/head_64.S | 6 |
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) | |||
87 | addl $(PMD_PAGE_SIZE -1), %ebx | 87 | addl $(PMD_PAGE_SIZE -1), %ebx |
88 | andl $PMD_PAGE_MASK, %ebx | 88 | andl $PMD_PAGE_MASK, %ebx |
89 | #else | 89 | #else |
90 | movl $CONFIG_PHYSICAL_START, %ebx | 90 | movl $LOAD_PHYSICAL_ADDR, %ebx |
91 | #endif | 91 | #endif |
92 | 92 | ||
93 | /* Target address to relocate to for decompression */ | 93 | /* Target address to relocate to for decompression */ |
@@ -215,7 +215,7 @@ ENTRY(startup_64) | |||
215 | * | 215 | * |
216 | * If it is a relocatable kernel then decompress and run the kernel | 216 | * If it is a relocatable kernel then decompress and run the kernel |
217 | * from load address aligned to 2MB addr, otherwise decompress and | 217 | * 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 |
219 | * | 219 | * |
220 | * We cannot rely on the calculation done in 32-bit mode, since we | 220 | * We cannot rely on the calculation done in 32-bit mode, since we |
221 | * may have been invoked via the 64-bit entry point. | 221 | * may have been invoked via the 64-bit entry point. |
@@ -228,7 +228,7 @@ ENTRY(startup_64) | |||
228 | andq $PMD_PAGE_MASK, %rbp | 228 | andq $PMD_PAGE_MASK, %rbp |
229 | movq %rbp, %rbx | 229 | movq %rbp, %rbx |
230 | #else | 230 | #else |
231 | movq $CONFIG_PHYSICAL_START, %rbp | 231 | movq $LOAD_PHYSICAL_ADDR, %rbp |
232 | movq %rbp, %rbx | 232 | movq %rbp, %rbx |
233 | #endif | 233 | #endif |
234 | 234 | ||