From: Andrew Morton <akpm@linux-foundation.org>

ipc/util.h: In function 'ipc_lock_check':
ipc/util.h:157: error: implicit declaration of function 'IS_ERR'
ipc/util.h:162: error: implicit declaration of function 'ERR_PTR'
ipc/util.h:162: warning: return makes pointer from integer without a cast

Cc: Nadia Derbey <Nadia.Derbey@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 ipc/util.h |    1 +
 1 file changed, 1 insertion(+)

diff -puN ipc/util.h~ipc-integrate-ipc_checkid-into-ipc_lock-fix ipc/util.h
--- a/ipc/util.h~ipc-integrate-ipc_checkid-into-ipc_lock-fix
+++ a/ipc/util.h
@@ -11,6 +11,7 @@
 #define _IPC_UTIL_H
 
 #include <linux/idr.h>
+#include <linux/err.h>
 
 #define USHRT_MAX 0xffff
 #define SEQ_MULTIPLIER	(IPCMNI)
_