diff --git a/[refs] b/[refs]
index 9dd5629ca2ee..1c8ca1cc05fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9833f8cb952b9aa3f98a71e7bef8820cee3261a0
+refs/heads/master: 868a23a8043f2a3042dae60105c89bd4680187ba
diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c
index fc84a30483c2..022d2ed7fd8b 100644
--- a/trunk/kernel/lockdep.c
+++ b/trunk/kernel/lockdep.c
@@ -2396,6 +2396,10 @@ static inline int separate_irq_context(struct task_struct *curr,
 	return 0;
 }
 
+void lockdep_trace_alloc(gfp_t gfp_mask)
+{
+}
+
 #endif
 
 /*