diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 16:39:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 16:39:00 -0400 |
commit | 8e7bfcbab3825d1b404d615cb1b54f44ff81f981 (patch) | |
tree | 5465eeb9c58af8dd8a26466c61de69b4b1df89dc /arch/ia64 | |
parent | 102dc1bae12a20214c9ee2d33a7402dc5175e30d (diff) | |
parent | 30f7276cb35a22743d709a460ae3639aad50366a (diff) |
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')
-rw-r--r-- | arch/ia64/kernel/vmlinux.lds.S | 1 | ||||
-rw-r--r-- | arch/ia64/oprofile/backtrace.c | 2 |
2 files changed, 2 insertions, 1 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 { | |||
209 | data : { | 209 | data : { |
210 | } :data | 210 | } :data |
211 | .data : AT(ADDR(.data) - LOAD_OFFSET) { | 211 | .data : AT(ADDR(.data) - LOAD_OFFSET) { |
212 | _sdata = .; | ||
212 | INIT_TASK_DATA(PAGE_SIZE) | 213 | INIT_TASK_DATA(PAGE_SIZE) |
213 | CACHELINE_ALIGNED_DATA(SMP_CACHE_BYTES) | 214 | CACHELINE_ALIGNED_DATA(SMP_CACHE_BYTES) |
214 | READ_MOSTLY_DATA(SMP_CACHE_BYTES) | 215 | READ_MOSTLY_DATA(SMP_CACHE_BYTES) |
diff --git a/arch/ia64/oprofile/backtrace.c b/arch/ia64/oprofile/backtrace.c index 5cdd7e4a597c..f7b798993cea 100644 --- a/arch/ia64/oprofile/backtrace.c +++ b/arch/ia64/oprofile/backtrace.c | |||
@@ -29,7 +29,7 @@ typedef struct | |||
29 | unsigned int depth; | 29 | unsigned int depth; |
30 | struct pt_regs *regs; | 30 | struct pt_regs *regs; |
31 | struct unw_frame_info frame; | 31 | struct unw_frame_info frame; |
32 | u64 *prev_pfs_loc; /* state for WAR for old spinlock ool code */ | 32 | unsigned long *prev_pfs_loc; /* state for WAR for old spinlock ool code */ |
33 | } ia64_backtrace_t; | 33 | } ia64_backtrace_t; |
34 | 34 | ||
35 | /* Returns non-zero if the PC is in the Interrupt Vector Table */ | 35 | /* Returns non-zero if the PC is in the Interrupt Vector Table */ |