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

Commit 3cdac41f authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: lds - Use PAGE_SIZE instead of numeric constant 



It's much better to use PAGE_SIZE then magic 4096
(though it's almost synonym in most cases on x86 but
not for *all* cases ;)

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent bbb1e57a

arch/x86/kernel/vmlinux_32.lds.S

+13 −13
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ SECTIONS 


  /* read-only */

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

	. = ALIGN(4096); /* not really needed, already page aligned */

	. = ALIGN(PAGE_SIZE); /* not really needed, already page aligned */

	*(.text.page_aligned)

	TEXT_TEXT

	SCHED_TEXT
@@ -70,21 +70,21 @@ SECTIONS 
  RODATA



  /* writeable */

  . = ALIGN(4096);

  . = ALIGN(PAGE_SIZE);

  .data : AT(ADDR(.data) - LOAD_OFFSET) {	/* Data */

	DATA_DATA

	CONSTRUCTORS

	} :data



  . = ALIGN(4096);

  . = ALIGN(PAGE_SIZE);

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

  	__nosave_begin = .;

	*(.data.nosave)

  	. = ALIGN(4096);

  	. = ALIGN(PAGE_SIZE);

  	__nosave_end = .;

  }



  . = ALIGN(4096);

  . = ALIGN(PAGE_SIZE);

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

	*(.data.page_aligned)

	*(.data.idt)
@@ -108,7 +108,7 @@ SECTIONS 
  }



  /* might get freed after init */

  . = ALIGN(4096);

  . = ALIGN(PAGE_SIZE);

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

  	__smp_locks = .;

	*(.smp_locks)
@@ -120,10 +120,10 @@ SECTIONS 
   * after boot. Always make sure that ALIGN() directive is present after

   * the section which contains __smp_alt_end.

   */

  . = ALIGN(4096);

  . = ALIGN(PAGE_SIZE);



  /* will be freed after init */

  . = ALIGN(4096);		/* Init code and data */

  . = ALIGN(PAGE_SIZE);		/* Init code and data */

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

  	__init_begin = .;

	_sinittext = .;
@@ -174,21 +174,21 @@ SECTIONS 
	EXIT_DATA

  }

#if defined(CONFIG_BLK_DEV_INITRD)

  . = ALIGN(4096);

  . = ALIGN(PAGE_SIZE);

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

	__initramfs_start = .;

	*(.init.ramfs)

	__initramfs_end = .;

  }

#endif

  . = ALIGN(4096);

  . = ALIGN(PAGE_SIZE);

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

	__per_cpu_start = .;

	*(.data.percpu)

	*(.data.percpu.shared_aligned)

	__per_cpu_end = .;

  }

  . = ALIGN(4096);

  . = ALIGN(PAGE_SIZE);

  /* freed after init ends here */



  .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
@@ -200,7 +200,7 @@ SECTIONS 
	__bss_stop = .;

  	_end = . ;

	/* This is where the kernel creates the early boot page tables */

	. = ALIGN(4096);

	. = ALIGN(PAGE_SIZE);

	pg0 = . ;

  }

arch/x86/kernel/vmlinux_64.lds.S

+14 −14
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ SECTIONS 
  .vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3))

		{ *(.vsyscall_3) }



  . = VSYSCALL_VIRT_ADDR + 4096;

  . = VSYSCALL_VIRT_ADDR + PAGE_SIZE;



#undef VSYSCALL_ADDR

#undef VSYSCALL_PHYS_ADDR
@@ -134,23 +134,23 @@ SECTIONS 
	*(.data.init_task)

  }:data.init



  . = ALIGN(4096);

  . = ALIGN(PAGE_SIZE);

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

	*(.data.page_aligned)

  }



  /* might get freed after init */

  . = ALIGN(4096);

  . = ALIGN(PAGE_SIZE);

  __smp_alt_begin = .;

  __smp_locks = .;

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

	*(.smp_locks)

  }

  __smp_locks_end = .;

  . = ALIGN(4096);

  . = ALIGN(PAGE_SIZE);

  __smp_alt_end = .;



  . = ALIGN(4096);		/* Init code and data */

  . = ALIGN(PAGE_SIZE);		/* Init code and data */

  __init_begin = .;

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

	_sinittext = .;
@@ -207,25 +207,25 @@ SECTIONS 
/* vdso blob that is mapped into user space */

  vdso_start = . ;

  .vdso  : AT(ADDR(.vdso) - LOAD_OFFSET) { *(.vdso) }

  . = ALIGN(4096);

  . = ALIGN(PAGE_SIZE);

  vdso_end = .;



#ifdef CONFIG_BLK_DEV_INITRD

  . = ALIGN(4096);

  . = ALIGN(PAGE_SIZE);

  __initramfs_start = .;

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

  __initramfs_end = .;

#endif



  PERCPU(4096)

  PERCPU(PAGE_SIZE)



  . = ALIGN(4096);

  . = ALIGN(PAGE_SIZE);

  __init_end = .;



  . = ALIGN(4096);

  . = ALIGN(PAGE_SIZE);

  __nosave_begin = .;

  .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) { *(.data.nosave) }

  . = ALIGN(4096);

  . = ALIGN(PAGE_SIZE);

  __nosave_end = .;



  __bss_start = .;		/* BSS */