Merge branches 'tracing/docs', 'tracing/filters', 'tracing/ftrace', 'tracing/kprobes...

[linux-2.6-omap-h63xx.git] / kernel / trace / ring_buffer.c

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index a09027ec17146dfd46b9729041181da75720e97f..edce2ff38944560dfd6532ee56c20ed684f69147 100644 (file)
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -580,8 +580,8 @@ static void rb_free_cpu_buffer(struct ring_buffer_per_cpu *cpu_buffer)
 extern int ring_buffer_page_too_big(void);
 
 #ifdef CONFIG_HOTPLUG_CPU
-static int __cpuinit rb_cpu_notify(struct notifier_block *self,
-                                  unsigned long action, void *hcpu);
+static int rb_cpu_notify(struct notifier_block *self,
+                        unsigned long action, void *hcpu);
 #endif
 
 /**
@@ -2861,8 +2861,8 @@ static __init int rb_init_debugfs(void)
 fs_initcall(rb_init_debugfs);
 
 #ifdef CONFIG_HOTPLUG_CPU
-static int __cpuinit rb_cpu_notify(struct notifier_block *self,
-                                  unsigned long action, void *hcpu)
+static int rb_cpu_notify(struct notifier_block *self,
+                        unsigned long action, void *hcpu)
 {
        struct ring_buffer *buffer =
                container_of(self, struct ring_buffer, cpu_notify);