android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ring-buffer: use CONFIG_HOTPLUG_CPU not CONFIG_HOTPLUG

Browse Source 
The hotplug code in the ring buffers is for use with CPU hotplug,
not generic hotplug.

Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
This commit is contained in:
Steven Rostedt 2009-03-12 11:46:03 -04:00
parent 1027fcb206
commit 59222efe2d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/trace/ring_buffer.c
View File

@ -303,7 +303,7 @@ struct ring_buffer {
struct ring_buffer_per_cpu **buffers; struct ring_buffer_per_cpu **buffers;
#ifdef CONFIG_HOTPLUG #ifdef CONFIG_HOTPLUG_CPU
struct notifier_block cpu_notify; struct notifier_block cpu_notify;
#endif #endif
}; };
@ -464,7 +464,7 @@ static void rb_free_cpu_buffer(struct ring_buffer_per_cpu *cpu_buffer)
*/ */
extern int ring_buffer_page_too_big(void); extern int ring_buffer_page_too_big(void);
#ifdef CONFIG_HOTPLUG #ifdef CONFIG_HOTPLUG_CPU
static int __cpuinit rb_cpu_notify(struct notifier_block *self, static int __cpuinit rb_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu); unsigned long action, void *hcpu);
#endif #endif
@ -523,7 +523,7 @@ struct ring_buffer *ring_buffer_alloc(unsigned long size, unsigned flags)
goto fail_free_buffers; goto fail_free_buffers;
} }
#ifdef CONFIG_HOTPLUG #ifdef CONFIG_HOTPLUG_CPU
buffer->cpu_notify.notifier_call = rb_cpu_notify; buffer->cpu_notify.notifier_call = rb_cpu_notify;
buffer->cpu_notify.priority = 0; buffer->cpu_notify.priority = 0;
register_cpu_notifier(&buffer->cpu_notify); register_cpu_notifier(&buffer->cpu_notify);
@ -562,7 +562,7 @@ ring_buffer_free(struct ring_buffer *buffer)
get_online_cpus(); get_online_cpus();
#ifdef CONFIG_HOTPLUG #ifdef CONFIG_HOTPLUG_CPU
unregister_cpu_notifier(&buffer->cpu_notify); unregister_cpu_notifier(&buffer->cpu_notify);
#endif #endif
@ -2757,7 +2757,7 @@ static __init int rb_init_debugfs(void)
fs_initcall(rb_init_debugfs); fs_initcall(rb_init_debugfs);
#ifdef CONFIG_HOTPLUG #ifdef CONFIG_HOTPLUG_CPU
static int __cpuinit rb_cpu_notify(struct notifier_block *self, static int __cpuinit rb_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu) unsigned long action, void *hcpu)
{ {