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

Commit 5d150a97 authored by Tim Abbott's avatar Tim Abbott Committed by Linus Torvalds
Browse files

um: Clean up linker script using standard macros. 



Signed-off-by: default avatarTim Abbott <tabbott@ksplice.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: user-mode-linux-devel@lists.sourceforge.net
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cd3db323

arch/um/include/asm/common.lds.S

+6 −23
Original line number Diff line number Diff line
@@ -16,11 +16,7 @@ 


  . = ALIGN(4096);

  .note : { *(.note.*) }

  __ex_table : {

	__start___ex_table = .;

	*(__ex_table)

	__stop___ex_table = .;

  }

  EXCEPTION_TABLE(0)



  BUG_TABLE
@@ -43,28 +39,17 @@ 
  }

	

  .init.setup : {

	__setup_start = .;

	*(.init.setup)

	__setup_end = .;

	INIT_SETUP(0)

  }



  . = ALIGN(32);

  .data.percpu : {

	__per_cpu_start = . ;

	*(.data.percpu)

	__per_cpu_end = . ;

  }

  PERCPU(32)

	

  .initcall.init : {

	__initcall_start = .;

	INITCALLS

	__initcall_end = .;

	INIT_CALLS

  }



  .con_initcall.init : {

	__con_initcall_start = .;

	*(.con_initcall.init)

	__con_initcall_end = .;

	CON_INITCALL

  }



  .uml.initcall.init : {
@@ -118,8 +103,6 @@ 


   . = ALIGN(4096);

  .init.ramfs : {

	__initramfs_start = .;

	*(.init.ramfs)

	__initramfs_end = .;

	INIT_RAM_FS

  }

arch/um/kernel/dyn.lds.S

+2 −7
Original line number Diff line number Diff line
@@ -16,11 +16,7 @@ SECTIONS 
  _text = .;

  _stext = .;

  __init_begin = .;

  .init.text : {

	_sinittext = .;

	INIT_TEXT

	_einittext = .;

  }

  INIT_TEXT_SECTION(PAGE_SIZE)



  . = ALIGN(PAGE_SIZE);
@@ -96,8 +92,7 @@ SECTIONS 
  .init_array     : { *(.init_array) }

  .fini_array     : { *(.fini_array) }

  .data           : {

    . = ALIGN(KERNEL_STACK_SIZE);		/* init_task */

    *(.data.init_task)

    INIT_TASK_DATA(KERNEL_STACK_SIZE)

    . = ALIGN(KERNEL_STACK_SIZE);

    *(.data.init_irqstack)

    DATA_DATA

arch/um/kernel/uml.lds.S

+6 −20
Original line number Diff line number Diff line
@@ -22,11 +22,7 @@ SECTIONS 
  _text = .;

  _stext = .;

  __init_begin = .;

  .init.text : {

	_sinittext = .;

	INIT_TEXT

	_einittext = .;

  }

  INIT_TEXT_SECTION(PAGE_SIZE)

  . = ALIGN(PAGE_SIZE);



  .text      :
@@ -52,8 +48,7 @@ SECTIONS 
  init.data : { INIT_DATA }

  .data    :

  {

    . = ALIGN(KERNEL_STACK_SIZE);		/* init_task */

    *(.data.init_task)

    INIT_TASK_DATA(KERNEL_STACK_SIZE)

    . = ALIGN(KERNEL_STACK_SIZE);

    *(.data.init_irqstack)

    DATA_DATA
@@ -81,19 +76,10 @@ SECTIONS 
  _edata  =  .;

  PROVIDE (edata = .);

  . = ALIGN(PAGE_SIZE);

  .sbss      :

  {

  __bss_start = .;

  PROVIDE(_bss_start = .);

   *(.sbss)

   *(.scommon)

  }

  .bss       :

  {

   *(.dynbss)

   *(.bss)

   *(COMMON)

  }

  SBSS(0)

  BSS(0)

  _end = .;

  PROVIDE (end = .);