aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells2012-10-04 06:10:18 -0500
committerDavid Howells2012-10-04 06:10:18 -0500
commit890139529d45ebd3c60d541f4eddc60e042fdf98 (patch)
treeb5a6bc076ca22ce95269544db5c9033496df8b95 /arch/hexagon
parent612a9aab56a93533e76e3ad91642db7033e03b69 (diff)
downloadam43-linux-kernel-890139529d45ebd3c60d541f4eddc60e042fdf98.tar.gz
am43-linux-kernel-890139529d45ebd3c60d541f4eddc60e042fdf98.tar.xz
am43-linux-kernel-890139529d45ebd3c60d541f4eddc60e042fdf98.zip
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/hexagon')
-rw-r--r--arch/hexagon/include/asm/unistd.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/hexagon/include/asm/unistd.h b/arch/hexagon/include/asm/unistd.h
index 4d0ecde3665..c0d5565030a 100644
--- a/arch/hexagon/include/asm/unistd.h
+++ b/arch/hexagon/include/asm/unistd.h
@@ -18,9 +18,6 @@
18 * 02110-1301, USA. 18 * 02110-1301, USA.
19 */ 19 */
20 20
21#if !defined(_ASM_HEXAGON_UNISTD_H) || defined(__SYSCALL)
22#define _ASM_HEXAGON_UNISTD_H
23
24/* 21/*
25 * The kernel pulls this unistd.h in three different ways: 22 * The kernel pulls this unistd.h in three different ways:
26 * 1. the "normal" way which gets all the __NR defines 23 * 1. the "normal" way which gets all the __NR defines
@@ -32,5 +29,3 @@
32#define sys_mmap2 sys_mmap_pgoff 29#define sys_mmap2 sys_mmap_pgoff
33 30
34#include <asm-generic/unistd.h> 31#include <asm-generic/unistd.h>
35
36#endif