diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-21 00:37:22 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-21 00:37:22 +0400 |
| commit | bc091c93a0f60717aa99e25c406892cd8c0187dc (patch) | |
| tree | 66fc7f6c97a11327c3acb0aee5c346717672a9f3 /arch/alpha/kernel | |
| parent | 3ed4c0583daa34dedb568b26ff99e5a7b58db612 (diff) | |
| parent | a2d063ac216c1618bfc2b4d40b7176adffa63511 (diff) | |
| download | linux-bc091c93a0f60717aa99e25c406892cd8c0187dc.tar.xz | |
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/alpha/kernel')
| -rw-r--r-- | arch/alpha/kernel/vmlinux.lds.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S index 433be2a24f31..3d890a98a08b 100644 --- a/arch/alpha/kernel/vmlinux.lds.S +++ b/arch/alpha/kernel/vmlinux.lds.S @@ -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) |