From 313326dfa3c4056ba9df5076eef82e149229b08a Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Thu, 23 Mar 2006 03:01:00 -0800 Subject: [PATCH] --- yaml --- r: 23084 b: refs/heads/master c: 2178426d26661ed6e18a8d6ea0bc05c98d73600d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/rcupdate.h | 2 -- trunk/kernel/rcupdate.c | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 24e955fef552..533039c90751 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a673c6b8fff4b2888ef1d47462e4be79936ac5a +refs/heads/master: 2178426d26661ed6e18a8d6ea0bc05c98d73600d diff --git a/trunk/include/linux/rcupdate.h b/trunk/include/linux/rcupdate.h index c2ec6c77874e..5673008b61e1 100644 --- a/trunk/include/linux/rcupdate.h +++ b/trunk/include/linux/rcupdate.h @@ -113,8 +113,6 @@ struct rcu_data { DECLARE_PER_CPU(struct rcu_data, rcu_data); DECLARE_PER_CPU(struct rcu_data, rcu_bh_data); -extern struct rcu_ctrlblk rcu_ctrlblk; -extern struct rcu_ctrlblk rcu_bh_ctrlblk; /* * Increment the quiescent state counter. diff --git a/trunk/kernel/rcupdate.c b/trunk/kernel/rcupdate.c index af8a2a57e17d..6df1559b1c02 100644 --- a/trunk/kernel/rcupdate.c +++ b/trunk/kernel/rcupdate.c @@ -50,13 +50,13 @@ #include /* Definition for rcupdate control block. */ -struct rcu_ctrlblk rcu_ctrlblk = { +static struct rcu_ctrlblk rcu_ctrlblk = { .cur = -300, .completed = -300, .lock = SPIN_LOCK_UNLOCKED, .cpumask = CPU_MASK_NONE, }; -struct rcu_ctrlblk rcu_bh_ctrlblk = { +static struct rcu_ctrlblk rcu_bh_ctrlblk = { .cur = -300, .completed = -300, .lock = SPIN_LOCK_UNLOCKED,