Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 444e0ae4 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Ingo Molnar
Browse files

x86, vmlinux.lds: unify start/end of SECTIONS 



[ Impact: cleanup ]

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Tim Abbott <tabbott@MIT.EDU>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <1240991249-27117-4-git-send-email-sam@ravnborg.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent afb8095a

arch/x86/kernel/vmlinux.lds.S

+14 −0
Original line number Diff line number Diff line
@@ -54,12 +54,26 @@ PHDRS { 
	note PT_NOTE FLAGS(0);          /* ___ */

}



SECTIONS

{

#ifdef CONFIG_X86_32

        . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;

        phys_startup_32 = startup_32 - LOAD_OFFSET;

#else

        . = __START_KERNEL;

        phys_startup_64 = startup_64 - LOAD_OFFSET;

#endif



#ifdef CONFIG_X86_32

# include "vmlinux_32.lds.S"

#else

# include "vmlinux_64.lds.S"

#endif



        STABS_DEBUG

        DWARF_DEBUG

}





#ifdef CONFIG_X86_32

ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE),

arch/x86/kernel/vmlinux_32.lds.S

+0 −9
Original line number Diff line number Diff line 
SECTIONS

{

	. = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;

	phys_startup_32 = startup_32 - LOAD_OFFSET;



	/* Text and read-only data */

	.text.head : AT(ADDR(.text.head) - LOAD_OFFSET) {

		_text = .;
@@ -205,7 +200,3 @@ SECTIONS 
		*(.exitcall.exit)

		*(.discard)

	}
 


	STABS_DEBUG

	DWARF_DEBUG

}

arch/x86/kernel/vmlinux_64.lds.S

+0 −9
Original line number Diff line number Diff line 
SECTIONS

{

	. = __START_KERNEL;

	phys_startup_64 = startup_64 - LOAD_OFFSET;



	/* Text and read-only data */

	.text :  AT(ADDR(.text) - LOAD_OFFSET) {

		_text = .;
@@ -277,7 +272,3 @@ SECTIONS 
		*(.eh_frame)

		*(.discard)

	}
 


	STABS_DEBUG

	DWARF_DEBUG

}