From 944bf91fe16d5228303e7d93e41ef1f654b4278f Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Tue, 31 Jul 2012 10:12:48 -0700 Subject: [PATCH] --- yaml --- r: 323537 b: refs/heads/master c: b4270ee356e5ecef5394ab80c0a0301c1676b7f0 h: refs/heads/master i: 323535: c6480f864c1af56c8146fd5de1525b846c898fa2 v: v3 --- [refs] | 2 +- trunk/include/linux/rcupdate.h | 6 ++---- trunk/kernel/rcutiny.c | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 078584bd3485..b3581c4a785e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e3fd2b38cea41f5386bf23440f2cbdd74cf13d0 +refs/heads/master: b4270ee356e5ecef5394ab80c0a0301c1676b7f0 diff --git a/trunk/include/linux/rcupdate.h b/trunk/include/linux/rcupdate.h index 115ead2b5155..0fbbd52e01f9 100644 --- a/trunk/include/linux/rcupdate.h +++ b/trunk/include/linux/rcupdate.h @@ -210,14 +210,12 @@ extern void exit_rcu(void); * to nest RCU_NONIDLE() wrappers, but the nesting level is currently * quite limited. If deeper nesting is required, it will be necessary * to adjust DYNTICK_TASK_NESTING_VALUE accordingly. - * - * This macro may be used from process-level code only. */ #define RCU_NONIDLE(a) \ do { \ - rcu_idle_exit(); \ + rcu_irq_enter(); \ do { a; } while (0); \ - rcu_idle_enter(); \ + rcu_irq_exit(); \ } while (0) /* diff --git a/trunk/kernel/rcutiny.c b/trunk/kernel/rcutiny.c index e4163c5af1de..2e073a24d250 100644 --- a/trunk/kernel/rcutiny.c +++ b/trunk/kernel/rcutiny.c @@ -115,6 +115,7 @@ void rcu_irq_exit(void) rcu_idle_enter_common(newval); local_irq_restore(flags); } +EXPORT_SYMBOL_GPL(rcu_irq_exit); /* Common code for rcu_idle_exit() and rcu_irq_enter(), see kernel/rcutree.c. */ static void rcu_idle_exit_common(long long oldval) @@ -172,6 +173,7 @@ void rcu_irq_enter(void) rcu_idle_exit_common(oldval); local_irq_restore(flags); } +EXPORT_SYMBOL_GPL(rcu_irq_enter); #ifdef CONFIG_DEBUG_LOCK_ALLOC