From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 5 Oct 2012 23:19:06 +0000 (+0100)
Subject: Merge branch 'fixes' into for-linus
X-Git-Tag: Ubuntu-5.10.0-12.13~20527^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b4874a3d298606c20118d1ead73235439bbc2823;p=mirror_ubuntu-hirsute-kernel.git

Merge branch 'fixes' into for-linus
---

b4874a3d298606c20118d1ead73235439bbc2823
diff --cc arch/arm/include/asm/syscall.h
index 47486a41c56e,fce38a684e44..9fdded6b1089
--- a/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,