1 files changed, 4 insertions, 23 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index 58fb8af15776..c51b6565e07c 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4567,8 +4567,6 @@ EXPORT_SYMBOL(schedule);
 asmlinkage void __sched preempt_schedule(void)
 {
         struct thread_info *ti = current_thread_info();
-        struct task_struct *task = current;
-        int saved_lock_depth;
 
         /*
          * If there is a non-zero preempt_count or interrupts are disabled,
@@ -4579,16 +4577,7 @@ asmlinkage void __sched preempt_schedule(void)
 
         do {
                 add_preempt_count(PREEMPT_ACTIVE);
-
-                /*
-                 * We keep the big kernel semaphore locked, but we
-                 * clear ->lock_depth so that schedule() doesnt
-                 * auto-release the semaphore:
-                 */
-                saved_lock_depth = task->lock_depth;
-                task->lock_depth = -1;
                 schedule();
-                task->lock_depth = saved_lock_depth;
                 sub_preempt_count(PREEMPT_ACTIVE);
 
                 /*
@@ -4609,26 +4598,15 @@ EXPORT_SYMBOL(preempt_schedule);
 asmlinkage void __sched preempt_schedule_irq(void)
 {
         struct thread_info *ti = current_thread_info();
-        struct task_struct *task = current;
-        int saved_lock_depth;
 
         /* Catch callers which need to be fixed */
         BUG_ON(ti->preempt_count || !irqs_disabled());
 
         do {
                 add_preempt_count(PREEMPT_ACTIVE);
-
-                /*
-                 * We keep the big kernel semaphore locked, but we
-                 * clear ->lock_depth so that schedule() doesnt
-                 * auto-release the semaphore:
-                 */
-                saved_lock_depth = task->lock_depth;
-                task->lock_depth = -1;
                 local_irq_enable();
                 schedule();
                 local_irq_disable();
-                task->lock_depth = saved_lock_depth;
                 sub_preempt_count(PREEMPT_ACTIVE);
 
                 /*
@@ -5853,8 +5831,11 @@ void __cpuinit init_idle(struct task_struct *idle, int cpu)
         spin_unlock_irqrestore(&rq->lock, flags);
 
         /* Set the preempt count _outside_ the spinlocks! */
+#if defined(CONFIG_PREEMPT)
+        task_thread_info(idle)->preempt_count = (idle->lock_depth >= 0);
+#else
         task_thread_info(idle)->preempt_count = 0;
-
+#endif
         /*
          * The idle tasks have their own, simple scheduling class:
          */