Revert45e29d119e("x86/syscalls: Make __X32_SYSCALL_BIT be unsigned long") and add a comment to discourage someone else from making the same mistake again. It turns out that some user code fails to compile if __X32_SYSCALL_BIT is unsigned long. See, for example [1] below. [ bp: Massage and do the same thing in the respective tools/ header. ] Fixes:45e29d119e("x86/syscalls: Make __X32_SYSCALL_BIT be unsigned long") Reported-by: Thorsten Glaser <t.glaser@tarent.de> Signed-off-by: Andy Lutomirski <luto@kernel.org> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: stable@kernel.org Link: [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=954294 Link: https://lkml.kernel.org/r/92e55442b744a5951fdc9cfee10badd0a5f7f828.1588983892.git.luto@kernel.org
		
			
				
	
	
		
			26 lines
		
	
	
		
			664 B
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			26 lines
		
	
	
		
			664 B
		
	
	
	
		
			C
		
	
	
	
	
	
| /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 | |
| #ifndef _UAPI_ASM_X86_UNISTD_H
 | |
| #define _UAPI_ASM_X86_UNISTD_H
 | |
| 
 | |
| /*
 | |
|  * x32 syscall flag bit.  Some user programs expect syscall NR macros
 | |
|  * and __X32_SYSCALL_BIT to have type int, even though syscall numbers
 | |
|  * are, for practical purposes, unsigned long.
 | |
|  *
 | |
|  * Fortunately, expressions like (nr & ~__X32_SYSCALL_BIT) do the right
 | |
|  * thing regardless.
 | |
|  */
 | |
| #define __X32_SYSCALL_BIT	0x40000000
 | |
| 
 | |
| #ifndef __KERNEL__
 | |
| # ifdef __i386__
 | |
| #  include <asm/unistd_32.h>
 | |
| # elif defined(__ILP32__)
 | |
| #  include <asm/unistd_x32.h>
 | |
| # else
 | |
| #  include <asm/unistd_64.h>
 | |
| # endif
 | |
| #endif
 | |
| 
 | |
| #endif /* _UAPI_ASM_X86_UNISTD_H */
 |