diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 13:37:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 13:37:22 -0700 |
| commit | bc091c93a0f60717aa99e25c406892cd8c0187dc (patch) | |
| tree | 66fc7f6c97a11327c3acb0aee5c346717672a9f3 /arch/m68k | |
| parent | 3ed4c0583daa34dedb568b26ff99e5a7b58db612 (diff) | |
| parent | a2d063ac216c1618bfc2b4d40b7176adffa63511 (diff) | |
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
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/kernel/vmlinux-std.lds | 2 | ||||
| -rw-r--r-- | arch/m68k/kernel/vmlinux-sun3.lds | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds index 878be5f38ca..d0993594f55 100644 --- a/arch/m68k/kernel/vmlinux-std.lds +++ b/arch/m68k/kernel/vmlinux-std.lds @@ -25,6 +25,8 @@ SECTIONS EXCEPTION_TABLE(16) + _sdata = .; /* Start of data section */ + RODATA RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE) diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds index 1ad6b7ad2c1..8080469ee6c 100644 --- a/arch/m68k/kernel/vmlinux-sun3.lds +++ b/arch/m68k/kernel/vmlinux-sun3.lds @@ -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 = .; |