[ 42/44] x86, um: Correct syscall table type attributes breaking gcc 4.8

From: Greg Kroah-Hartman
Date: Wed Jun 05 2013 - 17:13:18 EST

3.4-stable review patch. If anyone has any objections, please let me know.


From: Martin Pelikan <pelikan@xxxxxxxxxxxx>

commit 9271b0b4b2044c6db06051fe60bc58cdd4f17c7c upstream.

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@xxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/1339269731-10772-1-git-send-email-pelikan@xxxxxxxxxxxx
Acked-by: Richard Weinberger <richard@xxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
Cc: Bernhard M. Wiedemann <bwiedemann@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

arch/x86/um/sys_call_table_32.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- 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 = {

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/