Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86, asm: Fix binutils 2.16 issue with __USER32_CS

While testing the patchset at

http://lkml.kernel.org/r/1306873314-32523-1-git-send-email-bp@alien8.de

with binutils 2.16.1 from hell, kernel build fails with the following
error:

arch/x86/ia32/ia32entry.S: Assembler messages:
arch/x86/ia32/ia32entry.S:139: Error: too many positional arguments
make[2]: *** [arch/x86/ia32/ia32entry.o] Error 1
make[1]: *** [arch/x86/ia32] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [arch/x86] Error 2
make: *** Waiting for unfinished jobs....

due to spaces between the operators of the __USER32_CS define. Fix it so
that gas 2.16 can swallow it too.

Signed-off-by: Borislav Petkov <bp@alien8.de>
Link: http://lkml.kernel.org/r/1307131642-32595-1-git-send-email-bp@alien8.de
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

authored by

Borislav Petkov and committed by
H. Peter Anvin
dd2897bf 38e6b75d

+1 -1
+1 -1
arch/x86/include/asm/segment.h
··· 162 162 #define GDT_ENTRY_DEFAULT_USER32_CS 4 163 163 #define GDT_ENTRY_DEFAULT_USER_DS 5 164 164 #define GDT_ENTRY_DEFAULT_USER_CS 6 165 - #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS * 8 + 3) 165 + #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3) 166 166 #define __USER32_DS __USER_DS 167 167 168 168 #define GDT_ENTRY_TSS 8 /* needs two entries */