Skip to contentSkip to conversation

sched/rt: Use schedule_preempt_disabled()

tip:sched/core tip-bot for Thomas Gleixner 1 participant 1 message Mar 1, 2012

Subsystems (12)
Arm (32-bit) x86 PowerPC MIPS +8 more subsystems
lore
Share & tools
lore

tip-bot for Thomas Gleixner

author
#0 lore raw
Commit-ID:  bd2f55361f18347e890d52ff9cfd8895455ec11b
Gitweb:     http://git.kernel.org/tip/bd2f55361f18347e890d52ff9cfd8895455ec11b
Author:     Thomas Gleixner <[email protected]>
AuthorDate: Mon, 21 Mar 2011 12:33:18 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 1 Mar 2012 10:28:03 +0100

sched/rt: Use schedule_preempt_disabled()

Coccinelle based conversion.

Signed-off-by Thomas Gleixner <[email protected]>
Acked-by Peter Zijlstra <[email protected]>
Link http://lkml.kernel.org/n/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>
---
 arch/arm/kernel/process.c              |    4 +---
 arch/avr32/kernel/process.c            |    4 +---
 arch/blackfin/kernel/process.c         |    4 +---
 arch/cris/kernel/process.c             |    4 +---
 arch/frv/kernel/process.c              |    4 +---
 arch/h8300/kernel/process.c            |    4 +---
 arch/ia64/kernel/process.c             |    4 +---
 arch/m32r/kernel/process.c             |    4 +---
 arch/m68k/kernel/process_mm.c          |    4 +---
 arch/m68k/kernel/process_no.c          |    4 +---
 arch/microblaze/kernel/process.c       |    4 +---
 arch/mips/kernel/process.c             |    4 +---
 arch/mn10300/kernel/process.c          |    4 +---
 arch/parisc/kernel/process.c           |    4 +---
 arch/powerpc/kernel/idle.c             |    8 ++++----
 arch/powerpc/platforms/iseries/setup.c |    8 ++------
 arch/s390/kernel/process.c             |    4 +---
 arch/score/kernel/process.c            |    4 +---
 arch/sh/kernel/idle.c                  |    4 +---
 arch/sparc/kernel/process_32.c         |    8 ++------
 arch/sparc/kernel/process_64.c         |   10 ++++------
 arch/tile/kernel/process.c             |    4 +---
 arch/x86/kernel/process_32.c           |    4 +---
 arch/x86/kernel/process_64.c           |    4 +---
 arch/xtensa/kernel/process.c           |    4 +---
 init/main.c                            |    5 +----
 kernel/mutex.c                         |    4 +---
 kernel/softirq.c                       |    4 +---
 28 files changed, 36 insertions(+), 95 deletions(-)
arch/arm/kernel/process.c +1 -3
index 971d65c..c2ae3cd 100644
@@ -239,9 +239,7 @@ void cpu_idle(void)
 		leds_event(led_idle_end);
 		rcu_idle_exit();
 		tick_nohz_idle_exit();
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/avr32/kernel/process.c +1 -3
index ea33957..92c5af9 100644
@@ -40,9 +40,7 @@ void cpu_idle(void)
 			cpu_idle_sleep();
 		rcu_idle_exit();
 		tick_nohz_idle_exit();
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/blackfin/kernel/process.c +1 -3
index 8dd0416..a80a643 100644
@@ -94,9 +94,7 @@ void cpu_idle(void)
 			idle();
 		rcu_idle_exit();
 		tick_nohz_idle_exit();
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/cris/kernel/process.c +1 -3
index aa585e4..d8f50ff 100644
@@ -115,9 +115,7 @@ void cpu_idle (void)
 				idle = default_idle;
 			idle();
 		}
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/frv/kernel/process.c +1 -3
index 3901df1..29cc497 100644
@@ -92,9 +92,7 @@ void cpu_idle(void)
 				idle();
 		}
 
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/h8300/kernel/process.c +1 -3
index 933bd38..1a173b3 100644
@@ -81,9 +81,7 @@ void cpu_idle(void)
 	while (1) {
 		while (!need_resched())
 			idle();
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/ia64/kernel/process.c +1 -3
index 6d33c5c..9dc52b6 100644
@@ -330,9 +330,7 @@ cpu_idle (void)
 			normal_xtp();
 #endif
 		}
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 		check_pgt_cache();
 		if (cpu_is_offline(cpu))
 			play_dead();
arch/m32r/kernel/process.c +1 -3
index 422bea9..3a4a32b 100644
@@ -90,9 +90,7 @@ void cpu_idle (void)
 
 			idle();
 		}
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/m68k/kernel/process_mm.c +1 -3
index 099283e..fe4186b 100644
@@ -78,9 +78,7 @@ void cpu_idle(void)
 	while (1) {
 		while (!need_resched())
 			idle();
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/m68k/kernel/process_no.c +1 -3
index 5e1078c..f7fe6c3 100644
@@ -73,9 +73,7 @@ void cpu_idle(void)
 	/* endless idle loop with no priority at all */
 	while (1) {
 		idle();
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/microblaze/kernel/process.c +1 -3
index 7dcb5bf..9155f7d 100644
@@ -110,9 +110,7 @@ void cpu_idle(void)
 		rcu_idle_exit();
 		tick_nohz_idle_exit();
 
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 		check_pgt_cache();
 	}
 }
arch/mips/kernel/process.c +1 -3
index 7955409..61f1cb4 100644
@@ -80,9 +80,7 @@ void __noreturn cpu_idle(void)
 #endif
 		rcu_idle_exit();
 		tick_nohz_idle_exit();
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/mn10300/kernel/process.c +1 -3
index 28eec31..cac401d 100644
@@ -123,9 +123,7 @@ void cpu_idle(void)
 			idle();
 		}
 
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/parisc/kernel/process.c +1 -3
index 62c60b8..d4b94b3 100644
@@ -71,9 +71,7 @@ void cpu_idle(void)
 	while (1) {
 		while (!need_resched())
 			barrier();
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 		check_pgt_cache();
 	}
 }
arch/powerpc/kernel/idle.c +4 -4
index 0a48bf5..6503514 100644
@@ -101,11 +101,11 @@ void cpu_idle(void)
 		ppc64_runlatch_on();
 		rcu_idle_exit();
 		tick_nohz_idle_exit();
-		preempt_enable_no_resched();
-		if (cpu_should_die())
+		if (cpu_should_die()) {
+			preempt_enable_no_resched();
 			cpu_die();
-		schedule();
-		preempt_disable();
+		}
+		schedule_preempt_disabled();
 	}
 }
arch/powerpc/platforms/iseries/setup.c +2 -6
index 8fc6258..a5fbf4c 100644
@@ -584,9 +584,7 @@ static void iseries_shared_idle(void)
 		if (hvlpevent_is_pending())
 			process_iSeries_events();
 
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
 

@@ -615,9 +613,7 @@ static void iseries_dedicated_idle(void)
 		ppc64_runlatch_on();
 		rcu_idle_exit();
 		tick_nohz_idle_exit();
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/s390/kernel/process.c +1 -3
index e795933..7618085 100644
@@ -97,9 +97,7 @@ void cpu_idle(void)
 		tick_nohz_idle_exit();
 		if (test_thread_flag(TIF_MCCK_PENDING))
 			s390_handle_mcck();
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/score/kernel/process.c +1 -3
index 25d0803..2707023 100644
@@ -53,9 +53,7 @@ void __noreturn cpu_idle(void)
 		while (!need_resched())
 			barrier();
 
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/sh/kernel/idle.c +1 -3
index 406508d..7e48928 100644
@@ -114,9 +114,7 @@ void cpu_idle(void)
 
 		rcu_idle_exit();
 		tick_nohz_idle_exit();
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/sparc/kernel/process_32.c +2 -6
index f793742..935fdbc 100644
@@ -113,9 +113,7 @@ void cpu_idle(void)
 			while (!need_resched())
 				cpu_relax();
 		}
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 		check_pgt_cache();
 	}
 }

@@ -138,9 +136,7 @@ void cpu_idle(void)
 			while (!need_resched())
 				cpu_relax();
 		}
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 		check_pgt_cache();
 	}
 }
arch/sparc/kernel/process_64.c +4 -6
index 39d8b05..ab9a292 100644
@@ -104,15 +104,13 @@ void cpu_idle(void)
 		rcu_idle_exit();
 		tick_nohz_idle_exit();
 
-		preempt_enable_no_resched();
-
 #ifdef CONFIG_HOTPLUG_CPU
-		if (cpu_is_offline(cpu))
+		if (cpu_is_offline(cpu)) {
+			preempt_enable_no_resched();
 			cpu_play_dead();
+		}
 #endif
-
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/tile/kernel/process.c +1 -3
index 4c1ac6e..6ae495e 100644
@@ -108,9 +108,7 @@ void cpu_idle(void)
 		}
 		rcu_idle_exit();
 		tick_nohz_idle_exit();
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/x86/kernel/process_32.c +1 -3
index c08d1ff..49888fe 100644
@@ -119,9 +119,7 @@ void cpu_idle(void)
 		}
 		rcu_idle_exit();
 		tick_nohz_idle_exit();
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/x86/kernel/process_64.c +1 -3
index cfa5c90..e34257c 100644
@@ -156,9 +156,7 @@ void cpu_idle(void)
 		}
 
 		tick_nohz_idle_exit();
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
arch/xtensa/kernel/process.c +1 -3
index 47041e7..2c90047 100644
@@ -113,9 +113,7 @@ void cpu_idle(void)
 	while (1) {
 		while (!need_resched())
 			platform_idle();
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 	}
 }
init/main.c +1 -4
index ff49a6d..4990f7e 100644
@@ -374,11 +374,8 @@ static noinline void __init_refok rest_init(void)
 	 * at least once to get things moving:
 	 */
 	init_idle_bootup_task(current);
-	preempt_enable_no_resched();
-	schedule();
-
+	schedule_preempt_disabled();
 	/* Call into cpu_idle with preempt disabled */
-	preempt_disable();
 	cpu_idle();
 }
kernel/mutex.c +1 -3
index 89096dd..a307cc9 100644
@@ -240,9 +240,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
 
 		/* didn't get the lock, go to sleep: */
 		spin_unlock_mutex(&lock->wait_lock, flags);
-		preempt_enable_no_resched();
-		schedule();
-		preempt_disable();
+		schedule_preempt_disabled();
 		spin_lock_mutex(&lock->wait_lock, flags);
 	}
kernel/softirq.c +1 -3
index 4eb3a0f..79b5247 100644
@@ -744,9 +744,7 @@ static int run_ksoftirqd(void * __bind_cpu)
 	while (!kthread_should_stop()) {
 		preempt_disable();
 		if (!local_softirq_pending()) {
-			preempt_enable_no_resched();
-			schedule();
-			preempt_disable();
+			schedule_preempt_disabled();
 		}
 
 		__set_current_state(TASK_RUNNING);