aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/include/asm/unistd.h
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-10-04 07:10:18 -0400
committerDavid Howells <dhowells@redhat.com>2012-10-04 07:10:18 -0400
commit890139529d45ebd3c60d541f4eddc60e042fdf98 (patch)
treeb5a6bc076ca22ce95269544db5c9033496df8b95 /arch/arm64/include/asm/unistd.h
parent612a9aab56a93533e76e3ad91642db7033e03b69 (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/arm64/include/asm/unistd.h')
-rw-r--r--arch/arm64/include/asm/unistd.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h
index fe18a683274f..f55ba3e56c32 100644
--- a/arch/arm64/include/asm/unistd.h
+++ b/arch/arm64/include/asm/unistd.h
@@ -13,8 +13,6 @@
13 * You should have received a copy of the GNU General Public License 13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16#if !defined(__ASM_UNISTD_H) || defined(__SYSCALL)
17#define __ASM_UNISTD_H
18 16
19#ifndef __SYSCALL_COMPAT 17#ifndef __SYSCALL_COMPAT
20#include <asm-generic/unistd.h> 18#include <asm-generic/unistd.h>
@@ -23,5 +21,3 @@
23#if defined(__KERNEL__) && defined(CONFIG_COMPAT) 21#if defined(__KERNEL__) && defined(CONFIG_COMPAT)
24#include <asm/unistd32.h> 22#include <asm/unistd32.h>
25#endif 23#endif
26
27#endif /* __ASM_UNISTD_H */