diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 12:54:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 12:54:26 -0700 |
| commit | 2528ce3237be4e900f5eaa455490146e1422e424 (patch) | |
| tree | 0be844679c06c7da121527189770f9737dfcc6c2 /arch | |
| 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')
| -rw-r--r-- | arch/avr32/kernel/stacktrace.c | 1 | ||||
| -rw-r--r-- | arch/mips/kernel/stacktrace.c | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/stacktrace.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/arch/avr32/kernel/stacktrace.c b/arch/avr32/kernel/stacktrace.c index f4bdb448049..c09f0d8dd67 100644 --- a/arch/avr32/kernel/stacktrace.c +++ b/arch/avr32/kernel/stacktrace.c @@ -10,6 +10,7 @@ #include <linux/sched.h> #include <linux/stacktrace.h> #include <linux/thread_info.h> +#include <linux/module.h> register unsigned long current_frame_pointer asm("r7"); diff --git a/arch/mips/kernel/stacktrace.c b/arch/mips/kernel/stacktrace.c index 5eb4681a73d..0632e2a849c 100644 --- a/arch/mips/kernel/stacktrace.c +++ b/arch/mips/kernel/stacktrace.c @@ -7,6 +7,7 @@ */ #include <linux/sched.h> #include <linux/stacktrace.h> +#include <linux/module.h> #include <asm/stacktrace.h> /* diff --git a/arch/sh/kernel/stacktrace.c b/arch/sh/kernel/stacktrace.c index 1b2ae35c4a7..54d1f61aa00 100644 --- a/arch/sh/kernel/stacktrace.c +++ b/arch/sh/kernel/stacktrace.c @@ -12,6 +12,7 @@ #include <linux/sched.h> #include <linux/stacktrace.h> #include <linux/thread_info.h> +#include <linux/module.h> #include <asm/ptrace.h> /* |