diff --git a/[refs] b/[refs]
index b1534345e0b4..17cad4f55f97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de0baf9ad661ac630a45a50ea1717cc4f4b33ace
+refs/heads/master: da7b3eab167091693ad215ad7692f7d0d24d1356
diff --git a/trunk/include/linux/tracepoint.h b/trunk/include/linux/tracepoint.h
index 63064e9403f2..69648c54a326 100644
--- a/trunk/include/linux/tracepoint.h
+++ b/trunk/include/linux/tracepoint.h
@@ -40,14 +40,14 @@ struct tracepoint {
 	do {								\
 		void **it_func;						\
 									\
-		rcu_read_lock_sched();					\
+		rcu_read_lock_sched_notrace();				\
 		it_func = rcu_dereference((tp)->funcs);			\
 		if (it_func) {						\
 			do {						\
 				((void(*)(proto))(*it_func))(args);	\
 			} while (*(++it_func));				\
 		}							\
-		rcu_read_unlock_sched();				\
+		rcu_read_unlock_sched_notrace();			\
 	} while (0)
 
 /*