Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89013952 authored by David Howells's avatar David Howells
Browse files

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: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 612a9aab

arch/arm64/include/asm/unistd.h

+0 −4
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

#if !defined(__ASM_UNISTD_H) || defined(__SYSCALL)

#define __ASM_UNISTD_H



#ifndef __SYSCALL_COMPAT

#include <asm-generic/unistd.h>
@@ -23,5 +21,3 @@ 
#if defined(__KERNEL__) && defined(CONFIG_COMPAT)

#include <asm/unistd32.h>

#endif
 


#endif /* __ASM_UNISTD_H */

arch/arm64/include/asm/unistd32.h

+0 −4
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

#if !defined(__ASM_UNISTD32_H) || defined(__SYSCALL)

#define __ASM_UNISTD32_H



#ifndef __SYSCALL

#define __SYSCALL(x, y)
@@ -754,5 +752,3 @@ __SYSCALL(__NR_syncfs, sys_syncfs) 
#define __ARCH_WANT_SYS_SIGPENDING

#define __ARCH_WANT_SYS_SIGPROCMASK

#define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
 


#endif /* __ASM_UNISTD32_H */

arch/c6x/include/asm/unistd.h

+0 −4
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
 *   NON INFRINGEMENT.	See the GNU General Public License for

 *   more details.

 */

#if !defined(_ASM_C6X_UNISTD_H) || defined(__SYSCALL)

#define _ASM_C6X_UNISTD_H



/* Use the standard ABI for syscalls. */

#include <asm-generic/unistd.h>
@@ -22,5 +20,3 @@ 
/* C6X-specific syscalls. */

#define __NR_cache_sync	(__NR_arch_specific_syscall + 0)

__SYSCALL(__NR_cache_sync, sys_cache_sync)
 


#endif /* _ASM_C6X_UNISTD_H */

arch/hexagon/include/asm/unistd.h

+0 −5
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ 
 * 02110-1301, USA.

 */



#if !defined(_ASM_HEXAGON_UNISTD_H) || defined(__SYSCALL)

#define _ASM_HEXAGON_UNISTD_H



/*

 *  The kernel pulls this unistd.h in three different ways:

 *  1.  the "normal" way which gets all the __NR defines
@@ -32,5 +29,3 @@ 
#define sys_mmap2 sys_mmap_pgoff



#include <asm-generic/unistd.h>
 


#endif

arch/openrisc/include/asm/unistd.h

+0 −5
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 
 * (at your option) any later version.

 */



#if !defined(__ASM_OPENRISC_UNISTD_H) || defined(__SYSCALL)

#define __ASM_OPENRISC_UNISTD_H



#define __ARCH_HAVE_MMU



#define sys_mmap2 sys_mmap_pgoff
@@ -27,5 +24,3 @@ 


#define __NR_or1k_atomic __NR_arch_specific_syscall

__SYSCALL(__NR_or1k_atomic, sys_or1k_atomic)
 


#endif /* __ASM_OPENRISC_UNISTD_H */