From 8639cda13a76ff0e8f249bd30f3c5ebe74701e5c Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Mon, 17 Dec 2012 16:03:24 -0800
Subject: [PATCH] --- yaml --- r: 346463 b: refs/heads/master c:
 8529091e8e2ae25e0f4003086f619765ff255e4b h: refs/heads/master i:   346461:
 066a0b1ba2585319032f7301a42cf3f12f6e513f   346459:
 9c43069bc75159303684231dd012c53763a1480a   346455:
 51251affff3c98e9bbf6b018a16bf9675ad8fdc5   346447:
 63ec31ae3189eea483fc7b77c0dacb0160ab3cb5   346431:
 ef62097adb87ad62a0def1f642b20e03676f5393 v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/compiler.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9bd2839d6d65..e898d187a242 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5ba911ec3792168530d35e16a8ec3b6fc60bcb5
+refs/heads/master: 8529091e8e2ae25e0f4003086f619765ff255e4b
diff --git a/trunk/include/linux/compiler.h b/trunk/include/linux/compiler.h
index f430e4162f41..b121554f1fe2 100644
--- a/trunk/include/linux/compiler.h
+++ b/trunk/include/linux/compiler.h
@@ -10,6 +10,7 @@
 # define __force	__attribute__((force))
 # define __nocast	__attribute__((nocast))
 # define __iomem	__attribute__((noderef, address_space(2)))
+# define __must_hold(x)	__attribute__((context(x,1,1)))
 # define __acquires(x)	__attribute__((context(x,0,1)))
 # define __releases(x)	__attribute__((context(x,1,0)))
 # define __acquire(x)	__context__(x,1)
@@ -33,6 +34,7 @@ extern void __chk_io_ptr(const volatile void __iomem *);
 # define __chk_user_ptr(x) (void)0
 # define __chk_io_ptr(x) (void)0
 # define __builtin_warning(x, y...) (1)
+# define __must_hold(x)
 # define __acquires(x)
 # define __releases(x)
 # define __acquire(x) (void)0