Skip to contentSkip to conversation

x86_64: change _end to end_before_pgt

PATCH In review Yinghai Lu 2 participants 2 messages Apr 10, 2008 – Apr 13, 2008 x86

lore
Share & tools
lore

Yinghai Lu

author
#0 lore raw

PATCH 1/1 x86_64: change _end to end_before_pgt

change the _end in compressed vmlinux_64.lds.

also change _heap to _ebss that is not needed.

arch/x86/boot/compressed/head_64.S +4 -4
index 7a212a6..d8819ef 100644
@@ -244,9 +244,9 @@ ENTRY(startup_64)
 /* Copy the compressed kernel to the end of our buffer
  * where decompression in place becomes safe.
  */
-	leaq	_end(%rip), %r8
-	leaq	_end(%rbx), %r9
-	movq	$_end /* - $startup_32 */, %rcx
+	leaq	_end_before_pgt(%rip), %r8
+	leaq	_end_before_pgt(%rbx), %r9
+	movq	$_end_before_pgt /* - $startup_32 */, %rcx
 1:	subq	$8, %r8
 	subq	$8, %r9
 	movq	0(%r8), %rax
@@ -268,7 +268,7 @@ relocated:
  */
 	xorq	%rax, %rax
 	leaq    _edata(%rbx), %rdi
-	leaq    _end(%rbx), %rcx
+	leaq    _end_before_pgt(%rbx), %rcx
 	subq	%rdi, %rcx
 	cld
 	rep
arch/x86/boot/compressed/vmlinux_64.lds +2 -2
index 7e5c720..bef1ac8 100644
@@ -39,10 +39,10 @@ SECTIONS
 		*(.bss.*)
 		*(COMMON)
 		. = ALIGN(8);
-		_end = . ;
+		_end_before_pgt = . ;
 		. = ALIGN(4096);
 		pgtable = . ;
 		. = . + 4096 * 6;
-		_heap = .;
+		_ebss = .;
 	}
 }
#1 lore raw
Quoted 3 lines · Yinghai Lu

change the _end in compressed vmlinux_64.lds.

also change _heap to _ebss that is not needed.

thanks Yinghai, applied your cleanup patch.

Ingo