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 | |
| parent | 8ffa5b65968262ba6bb046329972791c0d960745 (diff) | |
| parent | 36bd53d07243ae83c1b73bae549086cea2252854 (diff) | |
| download | linux-3.10-2528ce3237be4e900f5eaa455490146e1422e424.tar.gz linux-3.10-2528ce3237be4e900f5eaa455490146e1422e424.tar.bz2 linux-3.10-2528ce3237be4e900f5eaa455490146e1422e424.zip | |
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
| -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 | ||||
| -rw-r--r-- | kernel/kthread.c | 4 |
4 files changed, 5 insertions, 2 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> /* diff --git a/kernel/kthread.c b/kernel/kthread.c index ac3fb732664..6111c27491b 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c @@ -106,7 +106,7 @@ static void create_kthread(struct kthread_create_info *create) */ sched_setscheduler(create->result, SCHED_NORMAL, ¶m); set_user_nice(create->result, KTHREAD_NICE_LEVEL); - set_cpus_allowed(create->result, CPU_MASK_ALL); + set_cpus_allowed_ptr(create->result, CPU_MASK_ALL_PTR); } complete(&create->done); } @@ -233,7 +233,7 @@ int kthreadd(void *unused) set_task_comm(tsk, "kthreadd"); ignore_signals(tsk); set_user_nice(tsk, KTHREAD_NICE_LEVEL); - set_cpus_allowed(tsk, CPU_MASK_ALL); + set_cpus_allowed_ptr(tsk, CPU_MASK_ALL_PTR); current->flags |= PF_NOFREEZE | PF_FREEZER_NOSIG; |