Merge branch 'sched/urgent' into sched/core, to avoid conflicts

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 11 insertions, 2 deletions

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 1e67b7a5968c..a4a0588c5397 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -119,8 +119,10 @@ extern struct trace_event_functions exit_syscall_print_funcs;
         static struct syscall_metadata __syscall_meta_##sname;          \
         static struct ftrace_event_call __used                          \
           event_enter_##sname = {                                       \
-                .name                   = "sys_enter"#sname,            \
                 .class                  = &event_class_syscall_enter,   \
+                {                                                       \
+                        .name                   = "sys_enter"#sname,    \
+                },                                                      \
                 .event.funcs            = &enter_syscall_print_funcs,   \
                 .data                   = (void *)&__syscall_meta_##sname,\
                 .flags                  = TRACE_EVENT_FL_CAP_ANY,       \
@@ -133,8 +135,10 @@ extern struct trace_event_functions exit_syscall_print_funcs;
         static struct syscall_metadata __syscall_meta_##sname;          \
         static struct ftrace_event_call __used                          \
           event_exit_##sname = {                                        \
-                .name                   = "sys_exit"#sname,             \
                 .class                  = &event_class_syscall_exit,    \
+                {                                                       \
+                        .name                   = "sys_exit"#sname,     \
+                },                                                      \
                 .event.funcs            = &exit_syscall_print_funcs,    \
                 .data                   = (void *)&__syscall_meta_##sname,\
                 .flags                  = TRACE_EVENT_FL_CAP_ANY,       \
@@ -200,6 +204,8 @@ extern struct trace_event_functions exit_syscall_print_funcs;
         }                                                               \
         static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
 
+asmlinkage long sys32_quotactl(unsigned int cmd, const char __user *special,
+                               qid_t id, void __user *addr);
 asmlinkage long sys_time(time_t __user *tloc);
 asmlinkage long sys_stime(time_t __user *tptr);
 asmlinkage long sys_gettimeofday(struct timeval __user *tv,
@@ -746,6 +752,9 @@ asmlinkage long sys_linkat(int olddfd, const char __user *oldname,
                            int newdfd, const char __user *newname, int flags);
 asmlinkage long sys_renameat(int olddfd, const char __user * oldname,
                              int newdfd, const char __user * newname);
+asmlinkage long sys_renameat2(int olddfd, const char __user *oldname,
+                              int newdfd, const char __user *newname,
+                              unsigned int flags);
 asmlinkage long sys_futimesat(int dfd, const char __user *filename,
                               struct timeval __user *utimes);
 asmlinkage long sys_faccessat(int dfd, const char __user *filename, int mode);