[tip:x86/urgent] x86, um: Correct syscall table type attributes breaking gcc 4.8

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Commit-ID:  9271b0b4b2044c6db06051fe60bc58cdd4f17c7c
Gitweb:     http://git.kernel.org/tip/9271b0b4b2044c6db06051fe60bc58cdd4f17c7c
Author:     Martin Pelikan <pelikan@xxxxxxxxxxxx>
AuthorDate: Sat, 9 Jun 2012 21:22:11 +0200
Committer:  H. Peter Anvin <hpa@xxxxxxxxx>
CommitDate: Sat, 9 Jun 2012 12:51:09 -0700

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@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>
---
 arch/x86/um/sys_call_table_32.c |    4 ++--
 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 416bd40..68d1dc9 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 = {
 	/*
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Stable Commits]     [Linux Stable Kernel]     [Linux Kernel]     [Linux USB Devel]     [Linux Video &Media]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux