summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pelikan <pelikan@storkhole.cz>2012-06-09 21:22:11 +0200
committerH. Peter Anvin <hpa@zytor.com>2012-06-09 12:51:09 -0700
commit9271b0b4b2044c6db06051fe60bc58cdd4f17c7c (patch)
tree9a0c760d176cafb53d451a7e1cdf7ef78513694e
parent77249539cd987884f86df6fd5c43b3dae1841be1 (diff)
downloadlinux-3.10-9271b0b4b2044c6db06051fe60bc58cdd4f17c7c.tar.gz
linux-3.10-9271b0b4b2044c6db06051fe60bc58cdd4f17c7c.tar.bz2
linux-3.10-9271b0b4b2044c6db06051fe60bc58cdd4f17c7c.zip
x86, um: Correct syscall table type attributes breaking gcc 4.8
The latest GCC 4.8 does some more checking on type attributes that break the build for ARCH=um -> fill them in. Specifically, the "asmlinkage" attributes is now tested for consistency. Signed-off-by: Martin Pelikan <pelikan@storkhole.cz> Link: http://lkml.kernel.org/r/1339269731-10772-1-git-send-email-pelikan@storkhole.cz Acked-by: Richard Weinberger <richard@nod.at> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--arch/x86/um/sys_call_table_32.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/um/sys_call_table_32.c b/arch/x86/um/sys_call_table_32.c
index 416bd40c0eb..68d1dc91b37 100644
--- a/arch/x86/um/sys_call_table_32.c
+++ b/arch/x86/um/sys_call_table_32.c
@@ -39,9 +39,9 @@
#undef __SYSCALL_I386
#define __SYSCALL_I386(nr, sym, compat) [ nr ] = sym,
-typedef void (*sys_call_ptr_t)(void);
+typedef asmlinkage void (*sys_call_ptr_t)(void);
-extern void sys_ni_syscall(void);
+extern asmlinkage void sys_ni_syscall(void);
const sys_call_ptr_t sys_call_table[] __cacheline_aligned = {
/*