51 lines
1.5 KiB
Diff
51 lines
1.5 KiB
Diff
From 417ce649c980174dfad4f076f6074566037df998 Mon Sep 17 00:00:00 2001
|
||
From: Ingo Molnar <mingo@elte.hu>
|
||
Date: Wed, 14 Dec 2011 12:51:28 +0100
|
||
Subject: [PATCH 210/278] rt/rcutree: Move misplaced prototype
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
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(-)
|
||
|
||
diff --git a/kernel/rcutree.c b/kernel/rcutree.c
|
||
index 3118218..8c26a49 100644
|
||
--- a/kernel/rcutree.c
|
||
+++ b/kernel/rcutree.c
|
||
@@ -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);
|
||
diff --git a/kernel/rcutree.h b/kernel/rcutree.h
|
||
index b522273..dca495d 100644
|
||
--- a/kernel/rcutree.h
|
||
+++ b/kernel/rcutree.h
|
||
@@ -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
|
||
--
|
||
1.7.10
|
||
|