diff --git a/[refs] b/[refs]
index dfa77e059157..2f4383a4f7cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45fcc70c0b6ee0c508e1fdb5fef735c3546803f4
+refs/heads/master: d2c123c27db841c6c11a63de9c144823d2b1ba76
diff --git a/trunk/include/linux/compiler.h b/trunk/include/linux/compiler.h
index 37bcb50a4d7c..04fb5135b4e1 100644
--- a/trunk/include/linux/compiler.h
+++ b/trunk/include/linux/compiler.h
@@ -261,6 +261,11 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
 # define __section(S) __attribute__ ((__section__(#S)))
 #endif
 
+/* Are two types/vars the same type (ignoring qualifiers)? */
+#ifndef __same_type
+# define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
+#endif
+
 /*
  * Prevent the compiler from merging or refetching accesses.  The compiler
  * is also forbidden from reordering successive instances of ACCESS_ONCE(),