diff --git a/[refs] b/[refs] index f3d7f4ed983f..51ef3d3bd207 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b3ef48adf847f7adf11c870e3ffacac150f1564 +refs/heads/master: 7c614d6461399acca5c0ba444f5db49cb332fc08 diff --git a/trunk/include/linux/rcupdate.h b/trunk/include/linux/rcupdate.h index ec90fc34fea9..8b4422c558da 100644 --- a/trunk/include/linux/rcupdate.h +++ b/trunk/include/linux/rcupdate.h @@ -191,7 +191,7 @@ static inline void rcu_read_lock_sched(void) __acquire(RCU_SCHED); rcu_read_acquire(); } -static inline void rcu_read_lock_sched_notrace(void) +static inline notrace void rcu_read_lock_sched_notrace(void) { preempt_disable_notrace(); __acquire(RCU_SCHED); @@ -209,7 +209,7 @@ static inline void rcu_read_unlock_sched(void) __release(RCU_SCHED); preempt_enable(); } -static inline void rcu_read_unlock_sched_notrace(void) +static inline notrace void rcu_read_unlock_sched_notrace(void) { rcu_read_release(); __release(RCU_SCHED);