diff --git a/[refs] b/[refs]
index 0949362000fe..1f88cefbaee9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e53cdf11dfc8d302ebb67e7112d1baf8d7c66d4
+refs/heads/master: 1b58c2515be48d5df79d20210ac5a86e30094de2
diff --git a/trunk/arch/powerpc/kernel/perf_counter.c b/trunk/arch/powerpc/kernel/perf_counter.c
index 4cc4ac5c791c..232b00a36f79 100644
--- a/trunk/arch/powerpc/kernel/perf_counter.c
+++ b/trunk/arch/powerpc/kernel/perf_counter.c
@@ -1002,7 +1002,7 @@ static void record_and_restart(struct perf_counter *counter, long val,
 	 */
 	if (record) {
 		addr = 0;
-		if (counter->attr.record_type & PERF_RECORD_ADDR) {
+		if (counter->attr.sample_type & PERF_SAMPLE_ADDR) {
 			/*
 			 * The user wants a data address recorded.
 			 * If we're not doing instruction sampling,