890139529d
asm-generic/unistd.h and a number of asm/unistd.h files have been given reinclusion guards that allow the guard to be overridden if __SYSCALL is defined. Unfortunately, these files define __SYSCALL and don't undefine it when they've finished with it, thus rendering the guard ineffective. The reason for this override is to allow the file to be #included multiple times with different settings on __SYSCALL for purposes like generating syscall tables. The following guards are problematic: arch/arm64/include/asm/unistd.h:#if !defined(__ASM_UNISTD_H) || defined(__SYSCALL) arch/arm64/include/asm/unistd32.h:#if !defined(__ASM_UNISTD32_H) || defined(__SYSCALL) arch/c6x/include/asm/unistd.h:#if !defined(_ASM_C6X_UNISTD_H) || defined(__SYSCALL) arch/hexagon/include/asm/unistd.h:#if !defined(_ASM_HEXAGON_UNISTD_H) || defined(__SYSCALL) arch/openrisc/include/asm/unistd.h:#if !defined(__ASM_OPENRISC_UNISTD_H) || defined(__SYSCALL) arch/score/include/asm/unistd.h:#if !defined(_ASM_SCORE_UNISTD_H) || defined(__SYSCALL) arch/tile/include/asm/unistd.h:#if !defined(_ASM_TILE_UNISTD_H) || defined(__SYSCALL) arch/unicore32/include/asm/unistd.h:#if !defined(__UNICORE_UNISTD_H__) || defined(__SYSCALL) include/asm-generic/unistd.h:#if !defined(_ASM_GENERIC_UNISTD_H) || defined(__SYSCALL) On the assumption that the guards' ineffectiveness has passed unnoticed, just remove these guards entirely. Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
42 lines
1.4 KiB
C
42 lines
1.4 KiB
C
/*
|
|
* Copyright 2010 Tilera Corporation. All Rights Reserved.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#if !defined(__LP64__) || defined(__SYSCALL_COMPAT)
|
|
/* Use the flavor of this syscall that matches the 32-bit API better. */
|
|
#define __ARCH_WANT_SYNC_FILE_RANGE2
|
|
#endif
|
|
|
|
/* Use the standard ABI for syscalls. */
|
|
#include <asm-generic/unistd.h>
|
|
|
|
/* Additional Tilera-specific syscalls. */
|
|
#define __NR_cacheflush (__NR_arch_specific_syscall + 1)
|
|
__SYSCALL(__NR_cacheflush, sys_cacheflush)
|
|
|
|
#ifndef __tilegx__
|
|
/* "Fast" syscalls provide atomic support for 32-bit chips. */
|
|
#define __NR_FAST_cmpxchg -1
|
|
#define __NR_FAST_atomic_update -2
|
|
#define __NR_FAST_cmpxchg64 -3
|
|
#define __NR_cmpxchg_badaddr (__NR_arch_specific_syscall + 0)
|
|
__SYSCALL(__NR_cmpxchg_badaddr, sys_cmpxchg_badaddr)
|
|
#endif
|
|
|
|
#ifdef __KERNEL__
|
|
/* In compat mode, we use sys_llseek() for compat_sys_llseek(). */
|
|
#ifdef CONFIG_COMPAT
|
|
#define __ARCH_WANT_SYS_LLSEEK
|
|
#endif
|
|
#define __ARCH_WANT_SYS_NEWFSTATAT
|
|
#endif
|