Merge branch 'for-2.6.32' into for-2.6.33

[mv-sheeva.git] / include / linux / syscalls.h

diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 02f19f9a76c6916b1292d7e4d5c43a9a93baf581..a990ace1a8380f01901b742a6b0821aff46a5d9d 100644 (file)
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -100,33 +100,25 @@ struct perf_event_attr;
 
 #ifdef CONFIG_EVENT_PROFILE
 #define TRACE_SYS_ENTER_PROFILE(sname)                                        \
-static int prof_sysenter_enable_##sname(struct ftrace_event_call *event_call)  \
+static int prof_sysenter_enable_##sname(void)                                 \
 {                                                                             \
-       int ret = 0;                                                           \
-       if (!atomic_inc_return(&event_enter_##sname.profile_count))            \
-               ret = reg_prof_syscall_enter("sys"#sname);                     \
-       return ret;                                                            \
+       return reg_prof_syscall_enter("sys"#sname);                            \
 }                                                                             \
                                                                               \
-static void prof_sysenter_disable_##sname(struct ftrace_event_call *event_call)\
+static void prof_sysenter_disable_##sname(void)                                       \
 {                                                                             \
-       if (atomic_add_negative(-1, &event_enter_##sname.profile_count))       \
-               unreg_prof_syscall_enter("sys"#sname);                         \
+       unreg_prof_syscall_enter("sys"#sname);                                 \
 }
 
 #define TRACE_SYS_EXIT_PROFILE(sname)                                         \
-static int prof_sysexit_enable_##sname(struct ftrace_event_call *event_call)   \
+static int prof_sysexit_enable_##sname(void)                                  \
 {                                                                             \
-       int ret = 0;                                                           \
-       if (!atomic_inc_return(&event_exit_##sname.profile_count))             \
-               ret = reg_prof_syscall_exit("sys"#sname);                      \
-       return ret;                                                            \
+       return reg_prof_syscall_exit("sys"#sname);                             \
 }                                                                             \
                                                                               \
-static void prof_sysexit_disable_##sname(struct ftrace_event_call *event_call) \
+static void prof_sysexit_disable_##sname(void)                                \
 {                                                                              \
-       if (atomic_add_negative(-1, &event_exit_##sname.profile_count))        \
-               unreg_prof_syscall_exit("sys"#sname);                          \
+       unreg_prof_syscall_exit("sys"#sname);                                  \
 }
 
 #define TRACE_SYS_ENTER_PROFILE_INIT(sname)                                   \
@@ -468,8 +460,7 @@ asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
                                void __user *data);
 asmlinkage long sys_umount(char __user *name, int flags);
 asmlinkage long sys_oldumount(char __user *name);
-asmlinkage long sys_truncate(const char __user *path,
-                               unsigned long length);
+asmlinkage long sys_truncate(const char __user *path, long length);
 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
 asmlinkage long sys_stat(char __user *filename,
                        struct __old_kernel_stat __user *statbuf);