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
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ SECTIONS
	__init_end = .;
	/* Freed after init ends here */

	_sdata = .;	/* Start of rw data section */
	_data = .;
	RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)

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

  _sdata = .;			/* Start of data section */
  RODATA
  RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE)
  _edata = .;			/* End of data section */
+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ SECTIONS

  EXCEPTION_TABLE(16)

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

  RODATA

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

  EXCEPTION_TABLE(16) :data
  _sdata = .;			/* Start of rw data section */
  RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE) :data
  /* End of data goes *here* so that freeing init code works properly. */
  _edata = .;
+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ SECTIONS
	NOTES :text :note
	.dummy : { *(.dummy) } :text

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

	/* writeable */
Loading