diff options
| author | David Howells <dhowells@redhat.com> | 2012-10-04 07:10:18 -0400 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-10-04 07:10:18 -0400 |
| commit | 890139529d45ebd3c60d541f4eddc60e042fdf98 (patch) | |
| tree | b5a6bc076ca22ce95269544db5c9033496df8b95 /arch/tile/include | |
| parent | 612a9aab56a93533e76e3ad91642db7033e03b69 (diff) | |
UAPI: Fix the guards on various asm/unistd.h files
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>
Diffstat (limited to 'arch/tile/include')
| -rw-r--r-- | arch/tile/include/asm/unistd.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/tile/include/asm/unistd.h b/arch/tile/include/asm/unistd.h index a017246ca0ce..0e1f3e66e492 100644 --- a/arch/tile/include/asm/unistd.h +++ b/arch/tile/include/asm/unistd.h | |||
| @@ -12,9 +12,6 @@ | |||
| 12 | * more details. | 12 | * more details. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #if !defined(_ASM_TILE_UNISTD_H) || defined(__SYSCALL) | ||
| 16 | #define _ASM_TILE_UNISTD_H | ||
| 17 | |||
| 18 | #if !defined(__LP64__) || defined(__SYSCALL_COMPAT) | 15 | #if !defined(__LP64__) || defined(__SYSCALL_COMPAT) |
| 19 | /* Use the flavor of this syscall that matches the 32-bit API better. */ | 16 | /* Use the flavor of this syscall that matches the 32-bit API better. */ |
| 20 | #define __ARCH_WANT_SYNC_FILE_RANGE2 | 17 | #define __ARCH_WANT_SYNC_FILE_RANGE2 |
| @@ -43,5 +40,3 @@ __SYSCALL(__NR_cmpxchg_badaddr, sys_cmpxchg_badaddr) | |||
| 43 | #endif | 40 | #endif |
| 44 | #define __ARCH_WANT_SYS_NEWFSTATAT | 41 | #define __ARCH_WANT_SYS_NEWFSTATAT |
| 45 | #endif | 42 | #endif |
| 46 | |||
| 47 | #endif /* _ASM_TILE_UNISTD_H */ | ||