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

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

x86, vmlinux.lds: unify .exit.* and .init.ramfs 



[ 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-11-git-send-email-sam@ravnborg.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent ae618362

arch/x86/kernel/vmlinux.lds.S

+20 −0
Original line number Diff line number Diff line
@@ -309,6 +309,26 @@ SECTIONS 
		*(.altinstr_replacement)

	}



	/*

	 * .exit.text is discard at runtime, not link time, to deal with

	 *  references from .altinstructions and .eh_frame

	 */

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

		EXIT_TEXT

	}



	.exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {

		EXIT_DATA

	}



#ifdef CONFIG_BLK_DEV_INITRD

	. = ALIGN(PAGE_SIZE);

	.init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {

		__initramfs_start = .;

		*(.init.ramfs)

		__initramfs_end = .;

	}

#endif



#ifdef CONFIG_X86_32

# include "vmlinux_32.lds.S"

arch/x86/kernel/vmlinux_32.lds.S

+0 −21
Original line number Diff line number Diff line 
	/*

	 * .exit.text is discard at runtime, not link time, to deal with

	 *  references from .altinstructions and .eh_frame

	 */

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

		EXIT_TEXT

	}



	.exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {

		EXIT_DATA

	}



#if defined(CONFIG_BLK_DEV_INITRD)

	. = ALIGN(PAGE_SIZE);

	.init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {

		__initramfs_start = .;

		*(.init.ramfs)

		__initramfs_end = .;

	}

#endif



	PERCPU(PAGE_SIZE)



	. = ALIGN(PAGE_SIZE);

arch/x86/kernel/vmlinux_64.lds.S

+0 −21
Original line number Diff line number Diff line 
	/*

	 * .exit.text is discard at runtime, not link time, to deal with

	 *  references from .altinstructions and .eh_frame

	 */

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

		EXIT_TEXT

	}



	.exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {

		EXIT_DATA

	}



#ifdef CONFIG_BLK_DEV_INITRD

	. = ALIGN(PAGE_SIZE);

	.init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {

		__initramfs_start = .;

		*(.init.ramfs)

		__initramfs_end = .;

	}

#endif



#ifdef CONFIG_SMP

	/*

	 * percpu offsets are zero-based on SMP.  PERCPU_VADDR() changes the