1 files changed, 7 insertions, 14 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index 5cd833bc2173..3df33da0dafc 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1567,6 +1567,7 @@ int fastcall wake_up_state(struct task_struct *p, unsigned int state)
         return try_to_wake_up(p, state, 0);
 }
 
+static void task_running_tick(struct rq *rq, struct task_struct *p);
 /*
  * Perform scheduler related setup for a newly forked process p.
  * p is forked by current.
@@ -1627,7 +1628,7 @@ void fastcall sched_fork(struct task_struct *p, int clone_flags)
                  * runqueue lock is not a problem.
                  */
                 current->time_slice = 1;
-                scheduler_tick();
+                task_running_tick(cpu_rq(cpu), current);
         }
         local_irq_enable();
         put_cpu();
@@ -4616,15 +4617,6 @@ asmlinkage long sys_sched_yield(void)
         return 0;
 }
 
-static inline int __resched_legal(int expected_preempt_count)
-{
-        if (unlikely(preempt_count() != expected_preempt_count))
-                return 0;
-        if (unlikely(system_state != SYSTEM_RUNNING))
-                return 0;
-        return 1;
-}
-
 static void __cond_resched(void)
 {
 #ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
@@ -4644,7 +4636,8 @@ static void __cond_resched(void)
 
 int __sched cond_resched(void)
 {
-        if (need_resched() && __resched_legal(0)) {
+        if (need_resched() && !(preempt_count() & PREEMPT_ACTIVE) &&
+                                        system_state == SYSTEM_RUNNING) {
                 __cond_resched();
                 return 1;
         }
@@ -4670,7 +4663,7 @@ int cond_resched_lock(spinlock_t *lock)
                 ret = 1;
                 spin_lock(lock);
         }
-        if (need_resched() && __resched_legal(1)) {
+        if (need_resched() && system_state == SYSTEM_RUNNING) {
                 spin_release(&lock->dep_map, 1, _THIS_IP_);
                 _raw_spin_unlock(lock);
                 preempt_enable_no_resched();
@@ -4686,7 +4679,7 @@ int __sched cond_resched_softirq(void)
 {
         BUG_ON(!in_softirq());
 
-        if (need_resched() && __resched_legal(0)) {
+        if (need_resched() && system_state == SYSTEM_RUNNING) {
                 raw_local_irq_disable();
                 _local_bh_enable();
                 raw_local_irq_enable();
@@ -5607,7 +5600,7 @@ static void cpu_attach_domain(struct sched_domain *sd, int cpu)
 }
 
 /* cpus with isolated domains */
-static cpumask_t __cpuinitdata cpu_isolated_map = CPU_MASK_NONE;
+static cpumask_t cpu_isolated_map = CPU_MASK_NONE;
 
 /* Setup the mask of cpus configured for isolated domains */
 static int __init isolated_cpu_setup(char *str)