From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 29 Oct 2015 15:21:30 +0000 (+0000)
Subject: Merge branches 'fixes' and 'misc' into for-next
X-Git-Tag: firefly_0821_release~176^2~840^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=116ef0fcc9268a876c8d1bbf77d8fa80111fa526;p=firefly-linux-kernel-4.4.55.git

Merge branches 'fixes' and 'misc' into for-next
---

116ef0fcc9268a876c8d1bbf77d8fa80111fa526
diff --cc arch/arm/include/asm/unistd.h
index 7cba573c2cc9,7cba573c2cc9,8f63daf3efa3..7b84657fba35
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@@@ -19,15 -19,15 -19,8 +19,8 @@@@
    * This may need to be greater than __NR_last_syscall+1 in order to
    * account for the padding in the syscall table
    */
  -#define __NR_syscalls  (388)
  +#define __NR_syscalls  (392)
   
-- /*
--  * *NOTE*: This is a ghost syscall private to the kernel.  Only the
--  * __kuser_cmpxchg code in entry-armv.S should be aware of its
--  * existence.  Don't ever use this from user code.
--  */
-- #define __ARM_NR_cmpxchg		(__ARM_NR_BASE+0x00fff0)
-- 
   #define __ARCH_WANT_STAT64
   #define __ARCH_WANT_SYS_GETHOSTNAME
   #define __ARCH_WANT_SYS_PAUSE