Merge branch 'fixes' into for-linus

diff --cc arch/arm/include/asm/syscall.h
index 47486a41c56e7ff9256061aa5f3fde75dc6a6e84,fce38a684e4493607cd0ad3c99381c56b22b7e33..9fdded6b108971412c3f92a13be48724313b3512
--- 1/arch/arm/include/asm/syscall.h
--- 2/arch/arm/include/asm/syscall.h
+++ b/arch/arm/include/asm/syscall.h
@@@ -8,11 -8,8 +8,12 @@@
  #define _ASM_ARM_SYSCALL_H
  
  #include <linux/err.h>
+ #include <linux/sched.h>
  
 +#include <asm/unistd.h>
 +
 +#define NR_syscalls (__NR_syscalls)
 +
  extern const unsigned long sys_call_table[];
  
  static inline int syscall_get_nr(struct task_struct *task,