diff options
| author | Greg Kroah-Hartman | 2012-11-14 21:30:12 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-11-14 21:30:12 +0100 |
| commit | 54d5f88f25c38e5500a17b16240cb3775af00876 (patch) | |
| tree | 09208d460e2f5aa93f5d2cdbbb2c5972758994ea /arch/xtensa/include/uapi/asm | |
| parent | tty: of_serial: fix return value check in of_platform_serial_setup() (diff) | |
| parent | Linux 3.7-rc5 (diff) | |
| download | kernel-qcow2-linux-54d5f88f25c38e5500a17b16240cb3775af00876.tar.gz kernel-qcow2-linux-54d5f88f25c38e5500a17b16240cb3775af00876.tar.xz kernel-qcow2-linux-54d5f88f25c38e5500a17b16240cb3775af00876.zip | |
Merge v3.7-rc5 into tty-next
This pulls in the 3.7-rc5 fixes into tty-next to make it easier to test.
Diffstat (limited to 'arch/xtensa/include/uapi/asm')
| -rw-r--r-- | arch/xtensa/include/uapi/asm/unistd.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/arch/xtensa/include/uapi/asm/unistd.h b/arch/xtensa/include/uapi/asm/unistd.h index 479abaea5aae..9f36d0e3e0ac 100644 --- a/arch/xtensa/include/uapi/asm/unistd.h +++ b/arch/xtensa/include/uapi/asm/unistd.h @@ -1,14 +1,4 @@ -/* - * include/asm-xtensa/unistd.h - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2001 - 2012 Tensilica Inc. - */ - -#ifndef _UAPI_XTENSA_UNISTD_H +#if !defined(_UAPI_XTENSA_UNISTD_H) || defined(__SYSCALL) #define _UAPI_XTENSA_UNISTD_H #ifndef __SYSCALL @@ -272,7 +262,7 @@ __SYSCALL(115, sys_sendmmsg, 4) #define __NR_clone 116 __SYSCALL(116, xtensa_clone, 5) #define __NR_execve 117 -__SYSCALL(117, xtensa_execve, 3) +__SYSCALL(117, sys_execve, 3) #define __NR_exit 118 __SYSCALL(118, sys_exit, 1) #define __NR_exit_group 119 @@ -759,4 +749,6 @@ __SYSCALL(331, sys_kcmp, 5) #define SYS_XTENSA_COUNT 5 /* count */ +#undef __SYSCALL + #endif /* _UAPI_XTENSA_UNISTD_H */ |