diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-12 06:28:26 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-12 06:28:26 +0400 |
| commit | f8b06550509fd68f673dc4ced482d2faa8efb531 (patch) | |
| tree | 149851e7887443d42251d4b84f2c65112efe09cb /arch/xtensa/include/asm/unistd.h | |
| parent | fb7d2ebd217a2a3cead4402b47c65c25881a2f75 (diff) | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| download | linux-f8b06550509fd68f673dc4ced482d2faa8efb531.tar.xz | |
Merge 3.7-rc5 into staging-next
Diffstat (limited to 'arch/xtensa/include/asm/unistd.h')
| -rw-r--r-- | arch/xtensa/include/asm/unistd.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/xtensa/include/asm/unistd.h b/arch/xtensa/include/asm/unistd.h index 9ef1c31d2c83..f4e6eaa40d1c 100644 --- a/arch/xtensa/include/asm/unistd.h +++ b/arch/xtensa/include/asm/unistd.h @@ -1,16 +1,9 @@ -/* - * 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 - 2005 Tensilica Inc. - */ +#ifndef _XTENSA_UNISTD_H +#define _XTENSA_UNISTD_H +#define __ARCH_WANT_SYS_EXECVE #include <uapi/asm/unistd.h> - /* * "Conditional" syscalls * @@ -37,3 +30,5 @@ #define __IGNORE_mmap /* use mmap2 */ #define __IGNORE_vfork /* use clone */ #define __IGNORE_fadvise64 /* use fadvise64_64 */ + +#endif /* _XTENSA_UNISTD_H */ |