From 33324ce287e55beb08a54e0fc4a9e21917c0e1e8 Mon Sep 17 00:00:00 2001
From: Jani Nikula <ext-jani.1.nikula@nokia.com>
Date: Mon, 24 May 2010 14:33:00 -0700
Subject: [PATCH] --- yaml --- r: 198276 b: refs/heads/master c:
 e47103b1af5df52fa69e18b14d3012472f78817d h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/include/linux/err.h | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f651fb96bc38..be618125c44a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f85f87d4f81d1e5a2d502d48316a1bdc5acac0b
+refs/heads/master: e47103b1af5df52fa69e18b14d3012472f78817d
diff --git a/trunk/include/linux/err.h b/trunk/include/linux/err.h
index 1b12642636c7..448afc12c78a 100644
--- a/trunk/include/linux/err.h
+++ b/trunk/include/linux/err.h
@@ -19,22 +19,22 @@
 
 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
 
-static inline void *ERR_PTR(long error)
+static inline void * __must_check ERR_PTR(long error)
 {
 	return (void *) error;
 }
 
-static inline long PTR_ERR(const void *ptr)
+static inline long __must_check PTR_ERR(const void *ptr)
 {
 	return (long) ptr;
 }
 
-static inline long IS_ERR(const void *ptr)
+static inline long __must_check IS_ERR(const void *ptr)
 {
 	return IS_ERR_VALUE((unsigned long)ptr);
 }
 
-static inline long IS_ERR_OR_NULL(const void *ptr)
+static inline long __must_check IS_ERR_OR_NULL(const void *ptr)
 {
 	return !ptr || IS_ERR_VALUE((unsigned long)ptr);
 }
@@ -46,7 +46,7 @@ static inline long IS_ERR_OR_NULL(const void *ptr)
  * Explicitly cast an error-valued pointer to another pointer type in such a
  * way as to make it clear that's what's going on.
  */
-static inline void *ERR_CAST(const void *ptr)
+static inline void * __must_check ERR_CAST(const void *ptr)
 {
 	/* cast away the const */
 	return (void *) ptr;