5 files changed, 4 insertions, 8 deletions

diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index db97c64ce0e..2233c98d80d 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -131,7 +131,7 @@ struct ftrace_event_call {
         void                    *mod;
         void                    *data;
 
-        atomic_t                profile_count;
+        int                     profile_count;
         int                     (*profile_enable)(struct ftrace_event_call *);
         void                    (*profile_disable)(struct ftrace_event_call *);
 };
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 94ac28437be..72d69860d90 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -102,12 +102,10 @@ struct perf_event_attr;
 #ifdef CONFIG_EVENT_PROFILE
 
 #define TRACE_SYS_ENTER_PROFILE_INIT(sname)                                    \
-        .profile_count = ATOMIC_INIT(-1),                                      \
         .profile_enable = prof_sysenter_enable,                                \
         .profile_disable = prof_sysenter_disable,
 
 #define TRACE_SYS_EXIT_PROFILE_INIT(sname)                                     \
-        .profile_count = ATOMIC_INIT(-1),                                      \
         .profile_enable = prof_sysexit_enable,                                 \
         .profile_disable = prof_sysexit_disable,
 #else
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 0c21af85211..73523151a73 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -629,7 +629,6 @@ static void ftrace_profile_disable_##name(struct ftrace_event_call *unused)\
 #ifdef CONFIG_EVENT_PROFILE
 
 #define _TRACE_PROFILE_INIT(call)                                       \
-        .profile_count = ATOMIC_INIT(-1),                               \
         .profile_enable = ftrace_profile_enable_##call,                 \
         .profile_disable = ftrace_profile_disable_##call,
 
diff --git a/kernel/trace/trace_event_profile.c b/kernel/trace/trace_event_profile.c
index d9c60f80aa0..9e25573242c 100644
--- a/kernel/trace/trace_event_profile.c
+++ b/kernel/trace/trace_event_profile.c
@@ -25,7 +25,7 @@ static int ftrace_profile_enable_event(struct ftrace_event_call *event)
         char *buf;
         int ret = -ENOMEM;
 
-        if (atomic_inc_return(&event->profile_count))
+        if (event->profile_count++ > 0)
                 return 0;
 
         if (!total_profile_count) {
@@ -56,7 +56,7 @@ fail_buf_nmi:
                 perf_trace_buf = NULL;
         }
 fail_buf:
-        atomic_dec(&event->profile_count);
+        event->profile_count--;
 
         return ret;
 }
@@ -83,7 +83,7 @@ static void ftrace_profile_disable_event(struct ftrace_event_call *event)
 {
         char *buf, *nmi_buf;
 
-        if (!atomic_add_negative(-1, &event->profile_count))
+        if (--event->profile_count > 0)
                 return;
 
         event->profile_disable(event);
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index e3c80e92589..6ed223447a3 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1426,7 +1426,6 @@ static int register_probe_event(struct trace_probe *tp)
         call->unregfunc = probe_event_disable;
 
 #ifdef CONFIG_EVENT_PROFILE
-        atomic_set(&call->profile_count, -1);
         call->profile_enable = probe_profile_enable;
         call->profile_disable = probe_profile_disable;
 #endif