diff --git a/[refs] b/[refs]
index 481ae877884a..93a4964bce4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5febcbe99d4766cc383909c447e002e63d8b4592
+refs/heads/master: baf05aa9271bdbc07d3160035a231abc5fbd429a
diff --git a/trunk/include/linux/bug.h b/trunk/include/linux/bug.h
index 72961c39576a..aaac4bba6f5c 100644
--- a/trunk/include/linux/bug.h
+++ b/trunk/include/linux/bug.h
@@ -30,6 +30,13 @@ struct pt_regs;
 #define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
 #define BUILD_BUG_ON_NULL(e) ((void *)sizeof(struct { int:-!!(e); }))
 
+/*
+ * BUILD_BUG_ON_INVALID() permits the compiler to check the validity of the
+ * expression but avoids the generation of any code, even if that expression
+ * has side-effects.
+ */
+#define BUILD_BUG_ON_INVALID(e) ((void)(sizeof((__force long)(e))))
+
 /**
  * BUILD_BUG_ON - break compile if a condition is true.
  * @condition: the condition which the compiler should know is false.