Commit aac3d396 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (25 commits)
  sched: Fix broken assertion
  sched: Assert task state bits at build time
  sched: Update task_state_arraypwith new states
  sched: Add missing state chars to TASK_STATE_TO_CHAR_STR
  sched: Move TASK_STATE_TO_CHAR_STR near the TASK_state bits
  sched: Teach might_sleep() about preemptible RCU
  sched: Make warning less noisy
  sched: Simplify set_task_cpu()
  sched: Remove the cfs_rq dependency from set_task_cpu()
  sched: Add pre and post wakeup hooks
  sched: Move kthread_bind() back to kthread.c
  sched: Fix select_task_rq() vs hotplug issues
  sched: Fix sched_exec() balancing
  sched: Ensure set_task_cpu() is never called on blocked tasks
  sched: Use TASK_WAKING for fork wakups
  sched: Select_task_rq_fair() must honour SD_LOAD_BALANCE
  sched: Fix task_hot() test order
  sched: Fix set_cpu_active() in cpu_down()
  sched: Mark boot-cpu active before smp_init()
  sched: Fix cpu_clock() in NMIs, on !CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
  ...
parents 10e5453f 077614ee

fs/proc/array.c

+12 −7
Original line number Diff line number Diff line
@@ -138,9 +138,12 @@ static const char *task_state_array[] = { 
	"S (sleeping)",		/*   1 */

	"D (disk sleep)",	/*   2 */

	"T (stopped)",		/*   4 */

	"T (tracing stop)",	/*  8 */

	"t (tracing stop)",	/*   8 */

	"Z (zombie)",		/*  16 */

	"X (dead)"		/* 32 */

	"X (dead)",		/*  32 */

	"x (dead)",		/*  64 */

	"K (wakekill)",		/* 128 */

	"W (waking)",		/* 256 */

};



static inline const char *get_task_state(struct task_struct *tsk)
@@ -148,6 +151,8 @@ static inline const char *get_task_state(struct task_struct *tsk) 
	unsigned int state = (tsk->state & TASK_REPORT) | tsk->exit_state;

	const char **p = &task_state_array[0];



	BUILD_BUG_ON(1 + ilog2(TASK_STATE_MAX) != ARRAY_SIZE(task_state_array));



	while (state) {

		p++;

		state >>= 1;

include/linux/rcutiny.h

+5 −0
Original line number Diff line number Diff line
@@ -101,4 +101,9 @@ static inline void exit_rcu(void) 
{

}



static inline int rcu_preempt_depth(void)

{

	return 0;

}



#endif /* __LINUX_RCUTINY_H */

include/linux/rcutree.h

+11 −0
Original line number Diff line number Diff line
@@ -45,6 +45,12 @@ extern void __rcu_read_unlock(void); 
extern void synchronize_rcu(void);

extern void exit_rcu(void);



/*

 * Defined as macro as it is a very low level header

 * included from areas that don't even know about current

 */

#define rcu_preempt_depth() (current->rcu_read_lock_nesting)



#else /* #ifdef CONFIG_TREE_PREEMPT_RCU */



static inline void __rcu_read_lock(void)
@@ -63,6 +69,11 @@ static inline void exit_rcu(void) 
{

}



static inline int rcu_preempt_depth(void)

{

	return 0;

}



#endif /* #else #ifdef CONFIG_TREE_PREEMPT_RCU */



static inline void __rcu_read_lock_bh(void)

include/linux/sched.h

+9 −4
Original line number Diff line number Diff line
@@ -192,6 +192,12 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq) 
#define TASK_DEAD		64

#define TASK_WAKEKILL		128

#define TASK_WAKING		256

#define TASK_STATE_MAX		512



#define TASK_STATE_TO_CHAR_STR "RSDTtZXxKW"



extern char ___assert_task_state[1 - 2*!!(

		sizeof(TASK_STATE_TO_CHAR_STR)-1 != ilog2(TASK_STATE_MAX)+1)];



/* Convenience macros for the sake of set_task_state */

#define TASK_KILLABLE		(TASK_WAKEKILL | TASK_UNINTERRUPTIBLE)
@@ -1091,7 +1097,8 @@ struct sched_class { 
			      enum cpu_idle_type idle);

	void (*pre_schedule) (struct rq *this_rq, struct task_struct *task);

	void (*post_schedule) (struct rq *this_rq);

	void (*task_wake_up) (struct rq *this_rq, struct task_struct *task);

	void (*task_waking) (struct rq *this_rq, struct task_struct *task);

	void (*task_woken) (struct rq *this_rq, struct task_struct *task);



	void (*set_cpus_allowed)(struct task_struct *p,

				 const struct cpumask *newmask);
@@ -1115,7 +1122,7 @@ struct sched_class { 
					 struct task_struct *task);



#ifdef CONFIG_FAIR_GROUP_SCHED

	void (*moved_group) (struct task_struct *p);

	void (*moved_group) (struct task_struct *p, int on_rq);

#endif

};
@@ -2594,8 +2601,6 @@ static inline void mm_init_owner(struct mm_struct *mm, struct task_struct *p) 
}

#endif /* CONFIG_MM_OWNER */



#define TASK_STATE_TO_CHAR_STR "RSDTtZX"



#endif /* __KERNEL__ */



#endif

init/main.c

+1 −6
Original line number Diff line number Diff line
@@ -369,12 +369,6 @@ static void __init smp_init(void) 
{

	unsigned int cpu;



	/*

	 * Set up the current CPU as possible to migrate to.

	 * The other ones will be done by cpu_up/cpu_down()

	 */

	set_cpu_active(smp_processor_id(), true);



	/* FIXME: This should be done in userspace --RR */

	for_each_present_cpu(cpu) {

		if (num_online_cpus() >= setup_max_cpus)
@@ -486,6 +480,7 @@ static void __init boot_cpu_init(void) 
	int cpu = smp_processor_id();

	/* Mark the boot cpu "present", "online" etc for SMP and UP case */

	set_cpu_online(cpu, true);

	set_cpu_active(cpu, true);

	set_cpu_present(cpu, true);

	set_cpu_possible(cpu, true);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE