tracing/ring-buffer: don't annotate rb_cpu_notify with __cpuinit
Subsystems (2)
PATCH 1/1 tracing/ring-buffer: don't annotate rb_cpu_notify with __cpuinit
Impact: remove a section warning
CONFIG_DEBUG_SECTION_MISMATCH raises the following warning on -tip:
WARNING: kernel/trace/built-in.o(.text+0x5bc5): Section mismatch in reference from the function ring_buffer_alloc() to the function .cpuinit.text:rb_cpu_notify()
The function ring_buffer_alloc() references
the function __cpuinit rb_cpu_notify().
This is actually harmless. The code in the ring buffer don't build rb_cpu_notify and other cpu hotplug stuffs when !CONFIG_HOTPLUG_CPU so we have no risk to reference freed memory here (it would even be harmless if we unconditionally build it because register_cpu_notifier would do nothing when !CONFIG_HOTPLUG_CPU.
But since ring_buffer_alloc() can be called everytime, we don't want it to be annotated with __cpuinit so we drop the __cpuinit from rb_cpu_notify.
This is not a waste of memory because it is only defined and used on CONFIG_HOTPLUG_CPU.
--- kernel/trace/ring_buffer.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
kernel/trace/ring_buffer.c +4 -4
@@ -536,8 +536,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 /**
@@ -2787,8 +2787,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);
Signature · 1 line
1.6.1
Commit-ID: 09c9e84d474d917d9de5b9011ed2064b03a19677 Gitweb: http://git.kernel.org/tip/09c9e84d474d917d9de5b9011ed2064b03a19677 Author: Frederic Weisbecker <[email protected]> AuthorDate: Sat, 21 Mar 2009 04:33:36 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Sat, 21 Mar 2009 10:54:10 +0100
tracing/ring-buffer: don't annotate rb_cpu_notify with __cpuinit
Impact: remove a section warning
CONFIG_DEBUG_SECTION_MISMATCH raises the following warning on -tip:
WARNING: kernel/trace/built-in.o(.text+0x5bc5): Section mismatch in reference from the function ring_buffer_alloc() to the function .cpuinit.text:rb_cpu_notify()
The function ring_buffer_alloc() references
the function __cpuinit rb_cpu_notify().
This is actually harmless. The code in the ring buffer don't build rb_cpu_notify and other cpu hotplug stuffs when !CONFIG_HOTPLUG_CPU so we have no risk to reference freed memory here (it would even be harmless if we unconditionally build it because register_cpu_notifier would do nothing when !CONFIG_HOTPLUG_CPU.
But since ring_buffer_alloc() can be called everytime, we don't want it to be annotated with __cpuinit so we drop the __cpuinit from rb_cpu_notify.
This is not a waste of memory because it is only defined and used on CONFIG_HOTPLUG_CPU.
LKML-Reference: <[email protected]>
--- kernel/trace/ring_buffer.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
kernel/trace/ring_buffer.c +4 -4
@@ -535,8 +535,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 /**
@@ -2784,8 +2784,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);