UAPI: Fix the guards on various asm/unistd.h files
authorDavid Howells <dhowells@redhat.com>
Thu, 4 Oct 2012 11:10:18 +0000 (12:10 +0100)
committerDavid Howells <dhowells@redhat.com>
Thu, 4 Oct 2012 11:10:18 +0000 (12:10 +0100)
commit890139529d45ebd3c60d541f4eddc60e042fdf98
treeb5a6bc076ca22ce95269544db5c9033496df8b95
parent612a9aab56a93533e76e3ad91642db7033e03b69
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>
arch/arm64/include/asm/unistd.h
arch/arm64/include/asm/unistd32.h
arch/c6x/include/asm/unistd.h
arch/hexagon/include/asm/unistd.h
arch/openrisc/include/asm/unistd.h
arch/score/include/asm/unistd.h
arch/tile/include/asm/unistd.h
arch/unicore32/include/asm/unistd.h
include/asm-generic/unistd.h