Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2528ce32 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-fixes-for-linus' of... 

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
parents 8ffa5b65 36bd53d0

arch/avr32/kernel/stacktrace.c

+1 −0
Original line number Diff line number Diff line
@@ -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");

arch/mips/kernel/stacktrace.c

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */

#include <linux/sched.h>

#include <linux/stacktrace.h>

#include <linux/module.h>

#include <asm/stacktrace.h>



/*

arch/sh/kernel/stacktrace.c

+1 −0
Original line number Diff line number Diff line
@@ -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>



/*

kernel/kthread.c

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static void create_kthread(struct kthread_create_info *create) 
		 */

		sched_setscheduler(create->result, SCHED_NORMAL, &param);

		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;