]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 02:19:00 +0000 (11:19 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 02:19:00 +0000 (11:19 +0900)
Pull C6X UAPI disintegration from Mark Salter:

 - scripted UAPI disintegration by David Howells.

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  UAPI: (Scripted) Disintegrate arch/c6x/include/asm

1  2 
arch/c6x/include/asm/Kbuild
arch/c6x/include/uapi/asm/unistd.h

Simple merge
index 0000000000000000000000000000000000000000,ed2259043eec278b5a792b0660a326e66e292142..4ff747d12dad317e408c86bf8df6285bb31d980b
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,22 +1,25 @@@
+ /*
+  * Copyright (C) 2011 Texas Instruments Incorporated
+  *
+  * Based on arch/tile version.
+  *
+  *   This program is free software; you can redistribute it and/or
+  *   modify it under the terms of the GNU General Public License
+  *   as published by the Free Software Foundation, version 2.
+  *
+  *   This program is distributed in the hope that it will be useful, but
+  *   WITHOUT ANY WARRANTY; without even the implied warranty of
+  *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
+  *   NON INFRINGEMENT.        See the GNU General Public License for
+  *   more details.
+  */
++#define __ARCH_WANT_KERNEL_EXECVE
++#define __ARCH_WANT_SYS_EXECVE
++
+ /* Use the standard ABI for syscalls. */
+ #include <asm-generic/unistd.h>
+ /* C6X-specific syscalls. */
+ #define __NR_cache_sync       (__NR_arch_specific_syscall + 0)
+ __SYSCALL(__NR_cache_sync, sys_cache_sync)