From d9952022f0fe2fa436730a668f88344eaf543008 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Thu, 12 Mar 2009 11:46:03 -0400
Subject: [PATCH] --- yaml --- r: 140927 b: refs/heads/master c:
 59222efe2d184956464abe5b637bc842ff053b93 h: refs/heads/master i:   140925:
 ec57eed7e6dcb1a363563b75b5c6051aacb204cc   140923:
 751cf5789ad61a7db3077020bcc786e026ade195   140919:
 d36a963e63f4698da9c987f2c482b53ca58b89f5   140911:
 415815f6088bb44f43aaabb8a2a07a00ac2d9743   140895:
 343fdcbdee08500c59b08d59ff7169dda1d7f10d   140863:
 35dcd73de7d6d71c532b3dd040147e821cdf9446   140799:
 06625dc8709ea6ea65a3d8baf223351863802427 v: v3

---
 [refs]                           |  2 +-
 trunk/kernel/trace/ring_buffer.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 6d6a56b9921d..ca3074b762b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1027fcb206a0fb8348e63aff078c74bdee1c2698
+refs/heads/master: 59222efe2d184956464abe5b637bc842ff053b93
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
index d07c2888396f..035b56c3a6c9 100644
--- a/trunk/kernel/trace/ring_buffer.c
+++ b/trunk/kernel/trace/ring_buffer.c
@@ -303,7 +303,7 @@ struct ring_buffer {
 
 	struct ring_buffer_per_cpu	**buffers;
 
-#ifdef CONFIG_HOTPLUG
+#ifdef CONFIG_HOTPLUG_CPU
 	struct notifier_block		cpu_notify;
 #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);
 
-#ifdef CONFIG_HOTPLUG
+#ifdef CONFIG_HOTPLUG_CPU
 static int __cpuinit rb_cpu_notify(struct notifier_block *self,
 				   unsigned long action, void *hcpu);
 #endif
@@ -523,7 +523,7 @@ struct ring_buffer *ring_buffer_alloc(unsigned long size, unsigned flags)
 			goto fail_free_buffers;
 	}
 
-#ifdef CONFIG_HOTPLUG
+#ifdef CONFIG_HOTPLUG_CPU
 	buffer->cpu_notify.notifier_call = rb_cpu_notify;
 	buffer->cpu_notify.priority = 0;
 	register_cpu_notifier(&buffer->cpu_notify);
@@ -562,7 +562,7 @@ ring_buffer_free(struct ring_buffer *buffer)
 
 	get_online_cpus();
 
-#ifdef CONFIG_HOTPLUG
+#ifdef CONFIG_HOTPLUG_CPU
 	unregister_cpu_notifier(&buffer->cpu_notify);
 #endif
 
@@ -2757,7 +2757,7 @@ static __init int rb_init_debugfs(void)
 
 fs_initcall(rb_init_debugfs);
 
-#ifdef CONFIG_HOTPLUG
+#ifdef CONFIG_HOTPLUG_CPU
 static int __cpuinit rb_cpu_notify(struct notifier_block *self,
 				   unsigned long action, void *hcpu)
 {