diff options
Diffstat (limited to 'kernel/trace/ring_buffer.c')
-rw-r--r-- | kernel/trace/ring_buffer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index d07c2888396..035b56c3a6c 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
@@ -303,7 +303,7 @@ struct ring_buffer { | |||
303 | 303 | ||
304 | struct ring_buffer_per_cpu **buffers; | 304 | struct ring_buffer_per_cpu **buffers; |
305 | 305 | ||
306 | #ifdef CONFIG_HOTPLUG | 306 | #ifdef CONFIG_HOTPLUG_CPU |
307 | struct notifier_block cpu_notify; | 307 | struct notifier_block cpu_notify; |
308 | #endif | 308 | #endif |
309 | }; | 309 | }; |
@@ -464,7 +464,7 @@ static void rb_free_cpu_buffer(struct ring_buffer_per_cpu *cpu_buffer) | |||
464 | */ | 464 | */ |
465 | extern int ring_buffer_page_too_big(void); | 465 | extern int ring_buffer_page_too_big(void); |
466 | 466 | ||
467 | #ifdef CONFIG_HOTPLUG | 467 | #ifdef CONFIG_HOTPLUG_CPU |
468 | static int __cpuinit rb_cpu_notify(struct notifier_block *self, | 468 | static int __cpuinit rb_cpu_notify(struct notifier_block *self, |
469 | unsigned long action, void *hcpu); | 469 | unsigned long action, void *hcpu); |
470 | #endif | 470 | #endif |
@@ -523,7 +523,7 @@ struct ring_buffer *ring_buffer_alloc(unsigned long size, unsigned flags) | |||
523 | goto fail_free_buffers; | 523 | goto fail_free_buffers; |
524 | } | 524 | } |
525 | 525 | ||
526 | #ifdef CONFIG_HOTPLUG | 526 | #ifdef CONFIG_HOTPLUG_CPU |
527 | buffer->cpu_notify.notifier_call = rb_cpu_notify; | 527 | buffer->cpu_notify.notifier_call = rb_cpu_notify; |
528 | buffer->cpu_notify.priority = 0; | 528 | buffer->cpu_notify.priority = 0; |
529 | register_cpu_notifier(&buffer->cpu_notify); | 529 | register_cpu_notifier(&buffer->cpu_notify); |
@@ -562,7 +562,7 @@ ring_buffer_free(struct ring_buffer *buffer) | |||
562 | 562 | ||
563 | get_online_cpus(); | 563 | get_online_cpus(); |
564 | 564 | ||
565 | #ifdef CONFIG_HOTPLUG | 565 | #ifdef CONFIG_HOTPLUG_CPU |
566 | unregister_cpu_notifier(&buffer->cpu_notify); | 566 | unregister_cpu_notifier(&buffer->cpu_notify); |
567 | #endif | 567 | #endif |
568 | 568 | ||
@@ -2757,7 +2757,7 @@ static __init int rb_init_debugfs(void) | |||
2757 | 2757 | ||
2758 | fs_initcall(rb_init_debugfs); | 2758 | fs_initcall(rb_init_debugfs); |
2759 | 2759 | ||
2760 | #ifdef CONFIG_HOTPLUG | 2760 | #ifdef CONFIG_HOTPLUG_CPU |
2761 | static int __cpuinit rb_cpu_notify(struct notifier_block *self, | 2761 | static int __cpuinit rb_cpu_notify(struct notifier_block *self, |
2762 | unsigned long action, void *hcpu) | 2762 | unsigned long action, void *hcpu) |
2763 | { | 2763 | { |