iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds 2011-05-20 13:37:22 -07:00
commit bc091c93a0
7 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/alpha/kernel/vmlinux.lds.S
View File

@ -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)

1
arch/m32r/kernel/vmlinux.lds.S
View File

@ -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 */

2
arch/m68k/kernel/vmlinux-std.lds
View File

@ -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)

1
arch/m68k/kernel/vmlinux-sun3.lds
View File

@ -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 = .;

1
arch/mips/kernel/vmlinux.lds.S
View File

@ -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 */

3
arch/parisc/kernel/vmlinux.lds.S
View File

@ -69,6 +69,9 @@ SECTIONS
/* End of text section */ /* End of text section */
_etext = .; _etext = .;
/* Start of data section */
_sdata = .;
RODATA RODATA
/* writeable */ /* writeable */

10
kernel/extable.c
View File

@ -72,6 +72,16 @@ int core_kernel_text(unsigned long addr)
return 0; return 0;
} }
/**
* core_kernel_data - tell if addr points to kernel data
* @addr: address to test
*
* Returns true if @addr passed in is from the core kernel data
* section.
*
* Note: On some archs it may return true for core RODATA, and false
* for others. But will always be true for core RW data.
*/
int core_kernel_data(unsigned long addr) int core_kernel_data(unsigned long addr)
{ {
if (addr >= (unsigned long)_sdata && if (addr >= (unsigned long)_sdata &&