1 files changed, 3 insertions, 3 deletions

diff --git a/include/linux/compat.h b/include/linux/compat.h
index 345da00a86e0..eb8a49d75ab3 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -41,14 +41,14 @@
         COMPAT_SYSCALL_DEFINEx(6, _##name, __VA_ARGS__)
 
 #define COMPAT_SYSCALL_DEFINEx(x, name, ...)                            \
-        asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
+        asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))\
+                __attribute__((alias(__stringify(compat_SyS##name))));  \
         static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
         asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__));\
         asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))\
         {                                                               \
                 return C_SYSC##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__)); \
         }                                                               \
-        SYSCALL_ALIAS(compat_sys##name, compat_SyS##name);              \
         static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
 
 #ifndef compat_user_stack_pointer
@@ -362,7 +362,7 @@ long compat_get_bitmap(unsigned long *mask, const compat_ulong_t __user *umask,
 long compat_put_bitmap(compat_ulong_t __user *umask, unsigned long *mask,
                        unsigned long bitmap_size);
 int copy_siginfo_from_user32(siginfo_t *to, struct compat_siginfo __user *from);
-int copy_siginfo_to_user32(struct compat_siginfo __user *to, siginfo_t *from);
+int copy_siginfo_to_user32(struct compat_siginfo __user *to, const siginfo_t *from);
 int get_compat_sigevent(struct sigevent *event,
                 const struct compat_sigevent __user *u_event);
 long compat_sys_rt_tgsigqueueinfo(compat_pid_t tgid, compat_pid_t pid, int sig,