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

Commit bc091c93 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of... 

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  extable, core_kernel_data(): Make sure all archs define _sdata
  core_kernel_data(): Fix architectures that do not define _sdata
parents 3ed4c058 a2d063ac

arch/alpha/kernel/vmlinux.lds.S

+1 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ SECTIONS 
	__init_end = .;

	__init_end = .;

	/* Freed after init ends here */

	/* Freed after init ends here */





	_sdata = .;	/* Start of rw data section */

	_data = .;

	_data = .;

	RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)

	RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)

arch/m32r/kernel/vmlinux.lds.S

+1 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ SECTIONS 
  EXCEPTION_TABLE(16)

  EXCEPTION_TABLE(16)

  NOTES

  NOTES





  _sdata = .;			/* Start of data section */

  RODATA

  RODATA

  RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE)

  RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE)

  _edata = .;			/* End of data section */

  _edata = .;			/* End of data section */

arch/m68k/kernel/vmlinux-std.lds

+2 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,8 @@ SECTIONS 




  EXCEPTION_TABLE(16)

  EXCEPTION_TABLE(16)





  _sdata = .;			/* Start of data section */



  RODATA

  RODATA





  RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE)

  RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE)

arch/m68k/kernel/vmlinux-sun3.lds

+1 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ SECTIONS 
  _etext = .;			/* End of text section */

  _etext = .;			/* End of text section */





  EXCEPTION_TABLE(16) :data

  EXCEPTION_TABLE(16) :data

  _sdata = .;			/* Start of rw data section */

  RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE) :data

  RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE) :data

  /* End of data goes *here* so that freeing init code works properly. */

  /* End of data goes *here* so that freeing init code works properly. */

  _edata = .;

  _edata = .;

arch/mips/kernel/vmlinux.lds.S

+1 −0
Original line number Original line Diff line number Diff line
@@ -65,6 +65,7 @@ SECTIONS 
	NOTES :text :note

	NOTES :text :note

	.dummy : { *(.dummy) } :text

	.dummy : { *(.dummy) } :text





	_sdata = .;			/* Start of data section */

	RODATA

	RODATA





	/* writeable */

	/* writeable */