2012-12-14 01:14:08 +00:00
|
|
|
|
From 5796e2d89127507fc9327886175a616665fafdef Mon Sep 17 00:00:00 2001
|
2011-12-15 14:24:33 +00:00
|
|
|
|
From: Ingo Molnar <mingo@elte.hu>
|
2012-05-12 14:20:55 +00:00
|
|
|
|
Date: Wed, 14 Dec 2011 12:51:28 +0100
|
2012-12-09 22:00:02 +00:00
|
|
|
|
Subject: [PATCH 210/290] rt/rcutree: Move misplaced prototype
|
2012-05-12 14:20:55 +00:00
|
|
|
|
MIME-Version: 1.0
|
|
|
|
|
Content-Type: text/plain; charset=UTF-8
|
|
|
|
|
Content-Transfer-Encoding: 8bit
|
2011-12-15 14:24:33 +00:00
|
|
|
|
|
|
|
|
|
Fix this warning on x86 defconfig:
|
|
|
|
|
|
|
|
|
|
kernel/rcutree.h:433:13: warning: ‘rcu_preempt_qs’ declared ‘static’ but never defined [-Wunused-function]
|
|
|
|
|
|
|
|
|
|
The #ifdefs and prototypes here are a maze, move it closer to the
|
|
|
|
|
usage site that needs it.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
|
|
|
---
|
|
|
|
|
kernel/rcutree.c | 2 ++
|
|
|
|
|
kernel/rcutree.h | 1 -
|
|
|
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
|
|
2012-05-12 14:20:55 +00:00
|
|
|
|
diff --git a/kernel/rcutree.c b/kernel/rcutree.c
|
2012-10-21 03:15:40 +00:00
|
|
|
|
index c1485ce..e3ace01 100644
|
2012-05-12 14:20:55 +00:00
|
|
|
|
--- a/kernel/rcutree.c
|
|
|
|
|
+++ b/kernel/rcutree.c
|
2011-12-15 14:24:33 +00:00
|
|
|
|
@@ -171,6 +171,8 @@ void rcu_sched_qs(int cpu)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_PREEMPT_RT_FULL
|
|
|
|
|
+static void rcu_preempt_qs(int cpu);
|
|
|
|
|
+
|
|
|
|
|
void rcu_bh_qs(int cpu)
|
|
|
|
|
{
|
|
|
|
|
rcu_preempt_qs(cpu);
|
2012-05-12 14:20:55 +00:00
|
|
|
|
diff --git a/kernel/rcutree.h b/kernel/rcutree.h
|
|
|
|
|
index b522273..dca495d 100644
|
|
|
|
|
--- a/kernel/rcutree.h
|
|
|
|
|
+++ b/kernel/rcutree.h
|
2011-12-15 14:24:33 +00:00
|
|
|
|
@@ -430,7 +430,6 @@ DECLARE_PER_CPU(char, rcu_cpu_has_work);
|
|
|
|
|
/* Forward declarations for rcutree_plugin.h */
|
|
|
|
|
static void rcu_bootup_announce(void);
|
|
|
|
|
long rcu_batches_completed(void);
|
|
|
|
|
-static void rcu_preempt_qs(int cpu);
|
|
|
|
|
static void rcu_preempt_note_context_switch(int cpu);
|
|
|
|
|
static int rcu_preempt_blocked_readers_cgp(struct rcu_node *rnp);
|
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|