diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 15:54:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 15:54:26 -0400 |
commit | 2528ce3237be4e900f5eaa455490146e1422e424 (patch) | |
tree | 0be844679c06c7da121527189770f9737dfcc6c2 /arch/sh/kernel | |
parent | 8ffa5b65968262ba6bb046329972791c0d960745 (diff) | |
parent | 36bd53d07243ae83c1b73bae549086cea2252854 (diff) |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
arch/mips/kernel/stacktrace.c: Heiko can't type
kthread: reduce stack pressure in create_kthread and kthreadd
fix core/stacktrace changes on avr32, mips, sh
Diffstat (limited to 'arch/sh/kernel')
-rw-r--r-- | arch/sh/kernel/stacktrace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/kernel/stacktrace.c b/arch/sh/kernel/stacktrace.c index 1b2ae35c4a76..54d1f61aa007 100644 --- a/arch/sh/kernel/stacktrace.c +++ b/arch/sh/kernel/stacktrace.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
13 | #include <linux/stacktrace.h> | 13 | #include <linux/stacktrace.h> |
14 | #include <linux/thread_info.h> | 14 | #include <linux/thread_info.h> |
15 | #include <linux/module.h> | ||
15 | #include <asm/ptrace.h> | 16 | #include <asm/ptrace.h> |
16 | 17 | ||
17 | /* | 18 | /* |