diff --git a/[refs] b/[refs]
index 253a6f223a6d..d84fc71cc771 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6eda5838bc5771578986429cde4a0870e1e5f5e1
+refs/heads/master: a92e70237c8abbd1c3241133bf72f2cd07c90eae
diff --git a/trunk/Documentation/perf_counter/perf.h b/trunk/Documentation/perf_counter/perf.h
index 391fcc73148a..fb1423072286 100644
--- a/trunk/Documentation/perf_counter/perf.h
+++ b/trunk/Documentation/perf_counter/perf.h
@@ -8,13 +8,17 @@
 #define PR_TASK_PERF_COUNTERS_DISABLE   31
 #define PR_TASK_PERF_COUNTERS_ENABLE    32
 
-#define rdclock()					\
-({							\
-	struct timespec ts;				\
-							\
-	clock_gettime(CLOCK_MONOTONIC, &ts);		\
-	ts.tv_sec * 1000000000ULL + ts.tv_nsec;		\
-})
+#ifndef NSEC_PER_SEC
+# define NSEC_PER_SEC			1000000000ULL
+#endif
+
+static inline unsigned long long rdclock(void)
+{
+	struct timespec ts;
+
+	clock_gettime(CLOCK_MONOTONIC, &ts);
+	return ts.tv_sec * 1000000000ULL + ts.tv_nsec;
+}
 
 /*
  * Pick up some kernel type conventions: