Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 23:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86/headers/uapi: Fix __BITS_PER_LONG value for x32 builds

Browse Source 
On x32, gcc predefines __x86_64__ but long is only 32-bit.  Use
__ILP32__ to distinguish x32.

Fixes this compiler error in perf:

	tools/include/asm-generic/bitops/__ffs.h: In function '__ffs':
	tools/include/asm-generic/bitops/__ffs.h:19:8: error: right shift count >= width of type [-Werror=shift-count-overflow]
	  word >>= 32;
	       ^

This isn't sufficient to build perf for x32, though.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/1443660043.2730.15.camel@decadent.org.uk
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ben Hutchings 2015-10-01 01:40:43 +01:00 committed by Ingo Molnar
parent ab76f7b4ab
commit f4b4aae182
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/uapi/asm/bitsperlong.h
View File

@ -1,7 +1,7 @@
#ifndef __ASM_X86_BITSPERLONG_H #ifndef __ASM_X86_BITSPERLONG_H
#define __ASM_X86_BITSPERLONG_H #define __ASM_X86_BITSPERLONG_H
#ifdef __x86_64__ #if defined(__x86_64__) && !defined(__ILP32__)
# define __BITS_PER_LONG 64 # define __BITS_PER_LONG 64
#else #else
# define __BITS_PER_LONG 32 # define __BITS_PER_LONG 32