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 /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 'kernel')
-rw-r--r-- | kernel/kthread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/kthread.c b/kernel/kthread.c index ac3fb7326641..6111c27491b1 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c | |||
@@ -106,7 +106,7 @@ static void create_kthread(struct kthread_create_info *create) | |||
106 | */ | 106 | */ |
107 | sched_setscheduler(create->result, SCHED_NORMAL, ¶m); | 107 | sched_setscheduler(create->result, SCHED_NORMAL, ¶m); |
108 | set_user_nice(create->result, KTHREAD_NICE_LEVEL); | 108 | set_user_nice(create->result, KTHREAD_NICE_LEVEL); |
109 | set_cpus_allowed(create->result, CPU_MASK_ALL); | 109 | set_cpus_allowed_ptr(create->result, CPU_MASK_ALL_PTR); |
110 | } | 110 | } |
111 | complete(&create->done); | 111 | complete(&create->done); |
112 | } | 112 | } |
@@ -233,7 +233,7 @@ int kthreadd(void *unused) | |||
233 | set_task_comm(tsk, "kthreadd"); | 233 | set_task_comm(tsk, "kthreadd"); |
234 | ignore_signals(tsk); | 234 | ignore_signals(tsk); |
235 | set_user_nice(tsk, KTHREAD_NICE_LEVEL); | 235 | set_user_nice(tsk, KTHREAD_NICE_LEVEL); |
236 | set_cpus_allowed(tsk, CPU_MASK_ALL); | 236 | set_cpus_allowed_ptr(tsk, CPU_MASK_ALL_PTR); |
237 | 237 | ||
238 | current->flags |= PF_NOFREEZE | PF_FREEZER_NOSIG; | 238 | current->flags |= PF_NOFREEZE | PF_FREEZER_NOSIG; |
239 | 239 | ||