diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-02-06 19:30:38 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-02-06 19:30:38 -0500 |
| commit | 1d9564ea0ac72ef7c4068d66fe42ad23af4ff53f (patch) | |
| tree | fa63b4c1bbd775252f71d05fef4de6a904eb4448 /arch/s390/kernel/stacktrace.c | |
| parent | 87f440e70e07dace7db130f2f9fcea3f132aad8f (diff) | |
| parent | dda2ac15d23b38e4335e858848aa8c9a6710304f (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/s390/kernel/stacktrace.c')
| -rw-r--r-- | arch/s390/kernel/stacktrace.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/s390/kernel/stacktrace.c b/arch/s390/kernel/stacktrace.c index 0d14a4789bf2..2e5c65a1863e 100644 --- a/arch/s390/kernel/stacktrace.c +++ b/arch/s390/kernel/stacktrace.c | |||
| @@ -11,11 +11,11 @@ | |||
| 11 | #include <linux/stacktrace.h> | 11 | #include <linux/stacktrace.h> |
| 12 | #include <linux/kallsyms.h> | 12 | #include <linux/kallsyms.h> |
| 13 | 13 | ||
| 14 | static inline unsigned long save_context_stack(struct stack_trace *trace, | 14 | static unsigned long save_context_stack(struct stack_trace *trace, |
| 15 | unsigned int *skip, | 15 | unsigned int *skip, |
| 16 | unsigned long sp, | 16 | unsigned long sp, |
| 17 | unsigned long low, | 17 | unsigned long low, |
| 18 | unsigned long high) | 18 | unsigned long high) |
| 19 | { | 19 | { |
| 20 | struct stack_frame *sf; | 20 | struct stack_frame *sf; |
| 21 | struct pt_regs *regs; | 21 | struct pt_regs *regs; |