diff options
| author |   Chris Zankel <chris@zankel.net> | 2012-10-23 20:17:05 -0700 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2012-10-25 14:53:36 -0700 |
| commit | 2f72d4f6a29cf84c40fc05c76020b347b4774393 (patch) | |
| tree | 3877c9fdac29b33d2beaab2c58c36a0d6f7649ca /arch/xtensa/include/uapi | |
| parent | Linux 3.7-rc2 (diff) | |
| download | linux-dev-2f72d4f6a29cf84c40fc05c76020b347b4774393.tar.xz linux-dev-2f72d4f6a29cf84c40fc05c76020b347b4774393.zip | |
xtensa: allow multi-inclusion for uapi/unistd.h
Xtensa implements a method that allows to generate a arbitrary output
for each system call by defining the __SYSCALL(number, function, num_args).
This usually requires to include uapi/unistd.h twice. Instead of removing
the guard agains multiple inclusion entirely, allow to include unistd.h again
only if __SYSCALL is defined. Note that __SYSCALL gets always undefined at
the end of the file.
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa/include/uapi')
| -rw-r--r-- | arch/xtensa/include/uapi/asm/unistd.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/arch/xtensa/include/uapi/asm/unistd.h b/arch/xtensa/include/uapi/asm/unistd.h index 479abaea5aae..1fd157f31211 100644 --- a/arch/xtensa/include/uapi/asm/unistd.h +++ b/arch/xtensa/include/uapi/asm/unistd.h @@ -1,14 +1,4 @@ -/* - * include/asm-xtensa/unistd.h - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 2001 - 2012 Tensilica Inc. - */ - -#ifndef _UAPI_XTENSA_UNISTD_H +#if !defined(_UAPI_XTENSA_UNISTD_H) || defined(__SYSCALL) #define _UAPI_XTENSA_UNISTD_H #ifndef __SYSCALL @@ -759,4 +749,6 @@ __SYSCALL(331, sys_kcmp, 5) #define SYS_XTENSA_COUNT 5 /* count */ +#undef __SYSCALL + #endif /* _UAPI_XTENSA_UNISTD_H */ |