Commit 4a9f54cf authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar

x86: cleanup: change _end to end_before_pgt

cleanup: change the _end in compressed vmlinux_64.lds.

also change _heap to _ebss that is not needed.
Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7c539764
...@@ -244,9 +244,9 @@ ENTRY(startup_64) ...@@ -244,9 +244,9 @@ ENTRY(startup_64)
/* Copy the compressed kernel to the end of our buffer /* Copy the compressed kernel to the end of our buffer
* where decompression in place becomes safe. * where decompression in place becomes safe.
*/ */
leaq _end(%rip), %r8 leaq _end_before_pgt(%rip), %r8
leaq _end(%rbx), %r9 leaq _end_before_pgt(%rbx), %r9
movq $_end /* - $startup_32 */, %rcx movq $_end_before_pgt /* - $startup_32 */, %rcx
1: subq $8, %r8 1: subq $8, %r8
subq $8, %r9 subq $8, %r9
movq 0(%r8), %rax movq 0(%r8), %rax
...@@ -268,7 +268,7 @@ relocated: ...@@ -268,7 +268,7 @@ relocated:
*/ */
xorq %rax, %rax xorq %rax, %rax
leaq _edata(%rbx), %rdi leaq _edata(%rbx), %rdi
leaq _end(%rbx), %rcx leaq _end_before_pgt(%rbx), %rcx
subq %rdi, %rcx subq %rdi, %rcx
cld cld
rep rep
......
...@@ -39,10 +39,10 @@ SECTIONS ...@@ -39,10 +39,10 @@ SECTIONS
*(.bss.*) *(.bss.*)
*(COMMON) *(COMMON)
. = ALIGN(8); . = ALIGN(8);
_end = . ; _end_before_pgt = . ;
. = ALIGN(4096); . = ALIGN(4096);
pgtable = . ; pgtable = . ;
. = . + 4096 * 6; . = . + 4096 * 6;
_heap = .; _ebss = .;
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment