diff --git a/[refs] b/[refs]
index dc3591b3c4cd..9807fb70c2bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06d1cd267ca0a2a76beb9a762465572dd3d0cce6
+refs/heads/master: 6ae2a0765ab764da11cc305058ee5333810228f4
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
index 94af1fe56bb4..091aeefe321e 100644
--- a/trunk/kernel/trace/ring_buffer.c
+++ b/trunk/kernel/trace/ring_buffer.c
@@ -130,7 +130,7 @@ struct buffer_page {
 static inline void free_buffer_page(struct buffer_page *bpage)
 {
 	if (bpage->page)
-		__free_page(bpage->page);
+		free_page((unsigned long)bpage->page);
 	kfree(bpage);
 }