diff --git a/[refs] b/[refs]
index c41abc3aa280..4737bd356295 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ed00415e304203a0a9dcaef226d6d3f1106070e
+refs/heads/master: 023c54c42288416b4f43c67bfd5049a76926fad6
diff --git a/trunk/Documentation/perf_counter/kerneltop.c b/trunk/Documentation/perf_counter/kerneltop.c
index c0ca01504ff3..430810dae1fe 100644
--- a/trunk/Documentation/perf_counter/kerneltop.c
+++ b/trunk/Documentation/perf_counter/kerneltop.c
@@ -1263,8 +1263,8 @@ static void mmap_read(struct mmap_data *md)
 		old += size;
 
 		switch (event->header.type) {
-		case PERF_EVENT_IP:
-		case PERF_EVENT_IP | __PERF_EVENT_TID:
+		case PERF_EVENT_OVERFLOW | __PERF_EVENT_IP:
+		case PERF_EVENT_OVERFLOW | __PERF_EVENT_IP | __PERF_EVENT_TID:
 			process_event(event->ip.ip, md->counter);
 			break;