diff --git a/[refs] b/[refs]
index c033fc6036a0..f08f3744719f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 383c5f8cd7d253be0017d8d5a39cbb78aaf70206
+refs/heads/master: 193e8df1b465f206f8a286202680702e1c153367
diff --git a/trunk/Documentation/perf_counter/kerneltop.c b/trunk/Documentation/perf_counter/kerneltop.c
index 25e80bc44556..8f9a303f28d8 100644
--- a/trunk/Documentation/perf_counter/kerneltop.c
+++ b/trunk/Documentation/perf_counter/kerneltop.c
@@ -1002,7 +1002,7 @@ static void record_ip(uint64_t ip, int counter)
 		assert(left <= middle && middle <= right);
 		if (!(left <= ip && ip <= right)) {
 			printf(" left: %016lx\n", left);
-			printf("   ip: %016llx\n", ip);
+			printf("   ip: %016lx\n", (unsigned long)ip);
 			printf("right: %016lx\n", right);
 		}
 		assert(left <= ip && ip <= right);