diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 12:05:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 12:05:38 -0400 |
commit | ee723cb3d419afcc8b6c7ccc0f73a34b0eb5ac7b (patch) | |
tree | 630bc3f1d0e57687e777d2f30e478a23baca9353 /arch/s390/kernel/stacktrace.c | |
parent | 7023cc61292f9cd61d99521206480f6e387132ff (diff) | |
parent | 8586cb60ce85f40431cf06fe97512269d3992f03 (diff) |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] dasd: use -EOPNOTSUPP instead of -ENOTSUPP
[S390] qdio: new qdio driver.
[S390] cio: Export chsc_error_from_response().
[S390] vmur: Fix return code handling.
[S390] Fix stacktrace compile bug.
[S390] Increase default warning stacksize.
[S390] dasd: Fix cleanup in dasd_{fba,diag}_check_characteristics().
[S390] chsc headers userspace cleanup
[S390] dasd: fix unsolicited SIM handling.
[S390] zfcpdump: Make SCSI disk dump tool recognize storage holes
Diffstat (limited to 'arch/s390/kernel/stacktrace.c')
-rw-r--r-- | arch/s390/kernel/stacktrace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/stacktrace.c b/arch/s390/kernel/stacktrace.c index 57571f10270c..8841919ef7e6 100644 --- a/arch/s390/kernel/stacktrace.c +++ b/arch/s390/kernel/stacktrace.c | |||
@@ -10,6 +10,7 @@ | |||
10 | #include <linux/sched.h> | 10 | #include <linux/sched.h> |
11 | #include <linux/stacktrace.h> | 11 | #include <linux/stacktrace.h> |
12 | #include <linux/kallsyms.h> | 12 | #include <linux/kallsyms.h> |
13 | #include <linux/module.h> | ||
13 | 14 | ||
14 | static unsigned long save_context_stack(struct stack_trace *trace, | 15 | static unsigned long save_context_stack(struct stack_trace *trace, |
15 | unsigned long sp, | 16 | unsigned long sp, |