Merge tag 'v3.13-rc1' into asoc-arizona

Linux 3.13-rc1

1 files changed, 4 insertions, 4 deletions

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 7fac04e7ff6e..94273bbe6050 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -120,7 +120,7 @@ extern struct trace_event_functions exit_syscall_print_funcs;
                 .class                  = &event_class_syscall_enter,   \
                 .event.funcs            = &enter_syscall_print_funcs,   \
                 .data                   = (void *)&__syscall_meta_##sname,\
-                .flags                  = TRACE_EVENT_FL_CAP_ANY,       \
+                .flags                  = TRACE_EVENT_FL_CAP_ANY,       \
         };                                                              \
         static struct ftrace_event_call __used                          \
           __attribute__((section("_ftrace_events")))                    \
@@ -134,7 +134,7 @@ extern struct trace_event_functions exit_syscall_print_funcs;
                 .class                  = &event_class_syscall_exit,    \
                 .event.funcs            = &exit_syscall_print_funcs,    \
                 .data                   = (void *)&__syscall_meta_##sname,\
-                .flags                  = TRACE_EVENT_FL_CAP_ANY,       \
+                .flags                  = TRACE_EVENT_FL_CAP_ANY,       \
         };                                                              \
         static struct ftrace_event_call __used                          \
           __attribute__((section("_ftrace_events")))                    \
@@ -184,7 +184,8 @@ extern struct trace_event_functions exit_syscall_print_funcs;
 
 #define __PROTECT(...) asmlinkage_protect(__VA_ARGS__)
 #define __SYSCALL_DEFINEx(x, name, ...)                                 \
-        asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));      \
+        asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))       \
+                __attribute__((alias(__stringify(SyS##name))));         \
         static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));  \
         asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__));      \
         asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))       \
@@ -194,7 +195,6 @@ extern struct trace_event_functions exit_syscall_print_funcs;
                 __PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__));       \
                 return ret;                                             \
         }                                                               \
-        SYSCALL_ALIAS(sys##name, SyS##name);                            \
         static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
 
 asmlinkage long sys_time(time_t __user *tloc);