From: Andrew Morton <akpm@osdl.org>

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/asm-x86_64/unistd.h |    3 +++
 1 file changed, 3 insertions(+)

diff -puN include/asm-x86_64/unistd.h~rename-the-provided-execve-functions-to-kernel_execve-headers-fix include/asm-x86_64/unistd.h
--- a/include/asm-x86_64/unistd.h~rename-the-provided-execve-functions-to-kernel_execve-headers-fix
+++ a/include/asm-x86_64/unistd.h
@@ -621,7 +621,10 @@ __SYSCALL(__NR_vmsplice, sys_vmsplice)
 __SYSCALL(__NR_move_pages, sys_move_pages)
 
 #define __NR_syscall_max __NR_move_pages
+
+#ifdef __KERNEL__
 #include <linux/err.h>
+#endif
 
 #ifndef __NO_STUBS
 
_