diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 13:39:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 13:39:00 -0700 |
| commit | 8e7bfcbab3825d1b404d615cb1b54f44ff81f981 (patch) | |
| tree | 5465eeb9c58af8dd8a26466c61de69b4b1df89dc /arch/ia64/kernel | |
| parent | 102dc1bae12a20214c9ee2d33a7402dc5175e30d (diff) | |
| parent | 30f7276cb35a22743d709a460ae3639aad50366a (diff) | |
| download | blackbird-op-linux-8e7bfcbab3825d1b404d615cb1b54f44ff81f981.tar.gz blackbird-op-linux-8e7bfcbab3825d1b404d615cb1b54f44ff81f981.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] define "_sdata" symbol
pstore: Fix Kconfig dependencies for apei->pstore
pstore: fix potential logic issue in pstore read interface
pstore: fix pstore filesystem mount/remount issue
pstore: fix one type of return value in pstore
[IA64] fix build warning in arch/ia64/oprofile/backtrace.c
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/vmlinux.lds.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index 787de4a77d82..53c0ba004e9e 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S @@ -209,6 +209,7 @@ SECTIONS { data : { } :data .data : AT(ADDR(.data) - LOAD_OFFSET) { + _sdata = .; INIT_TASK_DATA(PAGE_SIZE) CACHELINE_ALIGNED_DATA(SMP_CACHE_BYTES) READ_MOSTLY_DATA(SMP_CACHE_BYTES) |
