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/score | |
| 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/score')
| -rw-r--r-- | arch/score/include/asm/unistd.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/score/include/asm/unistd.h b/arch/score/include/asm/unistd.h index 4aa957364d4d..a862384e9c16 100644 --- a/arch/score/include/asm/unistd.h +++ b/arch/score/include/asm/unistd.h | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | #if !defined(_ASM_SCORE_UNISTD_H) || defined(__SYSCALL) | ||
| 2 | #define _ASM_SCORE_UNISTD_H | ||
| 3 | |||
| 4 | #define __ARCH_HAVE_MMU | 1 | #define __ARCH_HAVE_MMU |
| 5 | 2 | ||
| 6 | #define __ARCH_WANT_SYSCALL_NO_AT | 3 | #define __ARCH_WANT_SYSCALL_NO_AT |
| @@ -9,5 +6,3 @@ | |||
| 9 | #define __ARCH_WANT_SYSCALL_DEPRECATED | 6 | #define __ARCH_WANT_SYSCALL_DEPRECATED |
| 10 | 7 | ||
| 11 | #include <asm-generic/unistd.h> | 8 | #include <asm-generic/unistd.h> |
| 12 | |||
| 13 | #endif /* _ASM_SCORE_UNISTD_H */ | ||