From 410f05704bf55445e453cfba862fba03d8b430f4 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Sun, 17 Apr 2011 23:45:23 -0700 Subject: [PATCH] --- yaml --- r: 245740 b: refs/heads/master c: 3acf4a9a3d63f23430f940842829175b0778a1b8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/rcutorture.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 10ebeb507425..def0b47f1cee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3995a25fa361ce987a7d0ade00b17e3151519d7 +refs/heads/master: 3acf4a9a3d63f23430f940842829175b0778a1b8 diff --git a/trunk/kernel/rcutorture.c b/trunk/kernel/rcutorture.c index c224da41890c..4d256dba7d9b 100644 --- a/trunk/kernel/rcutorture.c +++ b/trunk/kernel/rcutorture.c @@ -163,11 +163,11 @@ static int stutter_pause_test; #endif int rcutorture_runnable = RCUTORTURE_RUNNABLE_INIT; -#ifdef CONFIG_RCU_BOOST +#if defined(CONFIG_RCU_BOOST) && !defined(CONFIG_HOTPLUG_CPU) #define rcu_can_boost() 1 -#else /* #ifdef CONFIG_RCU_BOOST */ +#else /* #if defined(CONFIG_RCU_BOOST) && !defined(CONFIG_HOTPLUG_CPU) */ #define rcu_can_boost() 0 -#endif /* #else #ifdef CONFIG_RCU_BOOST */ +#endif /* #else #if defined(CONFIG_RCU_BOOST) && !defined(CONFIG_HOTPLUG_CPU) */ static unsigned long boost_starttime; /* jiffies of next boost test start. */ DEFINE_MUTEX(boost_mutex); /* protect setting boost_starttime */