From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 5 Aug 2010 07:46:29 +0000 (+0200)
Subject: Merge branch 'sched/urgent' into sched/core
X-Git-Tag: v2.6.36-rc1~531^2
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=0bcfe75807944106a3aa655a54bb610d62f3a7f5;p=net-next-2.6.git

Merge branch 'sched/urgent' into sched/core

Conflicts:
	include/linux/sched.h

Merge reason: Add the leftover .35 urgent bits, fix the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

0bcfe75807944106a3aa655a54bb610d62f3a7f5
diff --cc include/linux/sched.h
index 9a7bc5ba7e7,6e0bb86de99..2091ea2a2c5
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -271,16 -271,13 +271,10 @@@ extern int runqueue_is_locked(int cpu)
  
  extern cpumask_var_t nohz_cpu_mask;
  #if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ)
 -extern int select_nohz_load_balancer(int cpu);
 -extern int get_nohz_load_balancer(void);
 +extern void select_nohz_load_balancer(int stop_tick);
 +extern int get_nohz_timer_target(void);
- extern int nohz_ratelimit(int cpu);
  #else
 -static inline int select_nohz_load_balancer(int cpu)
 -{
 -	return 0;
 -}
 +static inline void select_nohz_load_balancer(int stop_tick) { }
- 
- static inline int nohz_ratelimit(int cpu)
- {
- 	return 0;
- }
  #endif
  
  /*