From: Ralf Baechle <ralf@linux-mips.org>

> include/linux/err.h: Assembler messages:
> include/linux/err.h:20: Error: no such instruction: `static inline void *ERR_PTR(long error)'
> include/linux/err.h:21: Error: junk at end of line, first unrecognized character is `{'

Seems you don't have my other patch which was meant to cure this.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/err.h |    4 ++++
 1 file changed, 4 insertions(+)

diff -puN include/linux/err.h~consistently-use-max_errno-in-__syscall_return-fix include/linux/err.h
--- a/include/linux/err.h~consistently-use-max_errno-in-__syscall_return-fix
+++ a/include/linux/err.h
@@ -15,6 +15,8 @@
  */
 #define MAX_ERRNO	4095
 
+#ifndef __ASSEMBLY__
+
 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
 
 static inline void *ERR_PTR(long error)
@@ -32,4 +34,6 @@ static inline long IS_ERR(const void *pt
 	return IS_ERR_VALUE((unsigned long)ptr);
 }
 
+#endif
+
 #endif /* _LINUX_ERR_H */
_