[Patch x86-tip] Clean up the warning message about RCU not defined

[Jin Dongming]

(This fix is for commit 4765c1db84c73f775eb1822a009117cbae524e9e
Titled "rcu-tiny: The Bloatwatch Edition, v6")

When the kernel is built, there is some message printed as
following:
include/linux/rcupdate.h:80:7: \
warning: "CONFIG_TINY_RCU" is not defined

So I did "grep _RCU .config" to search the information of "CONFIG_TINY_RCU"
in .config file and the result is listed as following:
Command:
grep _RCU .config
Result:
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_TINY_RCU is not set
CONFIG_RCU_TRACE=y
CONFIG_RCU_FANOUT=64
# CONFIG_RCU_FANOUT_EXACT is not set
CONFIG_TREE_RCU_TRACE=y
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_RCU_CPU_STALL_DETECTOR is not set

Though the "WARNING" does not give impact to build kernel, I think
it should be cleaned up. And I made the patch for modifying it.
With this patch there is not any other warning message of
CONFIG_TINY_RCU and the kernel could be built successfully. And I
confirmed that the built kernel works well.

Signed-off-by: Jin Dongming <jin.do...@np.css.fujitsu.com>
---
include/linux/rcupdate.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index b2f1e10..fe5c560 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -77,7 +77,7 @@ extern int rcu_scheduler_active;

#if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU)
#include <linux/rcutree.h>
-#elif CONFIG_TINY_RCU
+#elif defined(CONFIG_TINY_RCU)
#include <linux/rcutiny.h>
#else
#error "Unknown RCU implementation specified to kernel configuration"
--
1.6.2.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[Paul E. McKenney]

Good catch!!!

Reviewed-by: Paul E. McKenney <pau...@linux.vnet.ibm.com>

[David Howells]

Jin Dongming <jin.do...@np.css.fujitsu.com> wrote:

Acked-by: David Howells <dhow...@redhat.com>

[tip-bot for Jin Dongming]

Commit-ID: 5ef9b8e59c043624fb44e31439cecf7f8b4cd62a
Gitweb: http://git.kernel.org/tip/5ef9b8e59c043624fb44e31439cecf7f8b4cd62a
Author: Jin Dongming <jin.do...@np.css.fujitsu.com>
AuthorDate: Fri, 25 Sep 2009 13:52:59 +0900
Committer: Ingo Molnar <mi...@elte.hu>
CommitDate: Sat, 26 Sep 2009 14:33:41 +0200

rcu: Clean up the warning message about RCU not defined

When the kernel is built, there is some message printed as
following:

include/linux/rcupdate.h:80:7: \
warning: "CONFIG_TINY_RCU" is not defined

So I did "grep _RCU .config" to search the information of "CONFIG_TINY_RCU"
in .config file and the result is listed as following:

Command:
grep _RCU .config
Result:
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
# CONFIG_TINY_RCU is not set
CONFIG_RCU_TRACE=y
CONFIG_RCU_FANOUT=64
# CONFIG_RCU_FANOUT_EXACT is not set
CONFIG_TREE_RCU_TRACE=y
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_RCU_CPU_STALL_DETECTOR is not set

Though the "WARNING" does not give impact to build kernel, I think
it should be cleaned up. And I made the patch for modifying it.
With this patch there is not any other warning message of
CONFIG_TINY_RCU and the kernel could be built successfully. And I
confirmed that the built kernel works well.

Signed-off-by: Jin Dongming <jin.do...@np.css.fujitsu.com>

Reviewed-by: "Paul E. McKenney " <pau...@linux.vnet.ibm.com>

Cc: ak...@linux-foundation.org
Cc: David Howells <dhow...@redhat.com>
Cc: Kenji Kaneshige <kaneshi...@jp.fujitsu.com>
Cc: Hidetoshi Seto <seto.hi...@jp.fujitsu.com>
LKML-Reference: <4ABC4CAB...@np.css.fujitsu.com>
Signed-off-by: Ingo Molnar <mi...@elte.hu>

---
include/linux/rcupdate.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index b2f1e10..fe5c560 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -77,7 +77,7 @@ extern int rcu_scheduler_active;

#if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU)
#include <linux/rcutree.h>
-#elif CONFIG_TINY_RCU
+#elif defined(CONFIG_TINY_RCU)
#include <linux/rcutiny.h>
#else
#error "Unknown RCU implementation specified to kernel configuration"
--

[4cream...@gmail.com]

include/linux/rcupdate.h
squid kernel msm8916 for osprey

Found a solution to similar issue: #error "Unknown RCU implementation specified to kernel configuration"

Solved

-line -278 to -284

- #if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU)
- #include <linux/rcutree.h>
- #elif defined(CONFIG_TINY_RCU) || defined(CONFIG_TINY_PREEMPT_RCU)
- #include <linux/rcutiny.h>
- #else
- #error "Unknown RCU implementation specified to kernel configuration"
- #endif

+Fix+line +278 to +292

#if defined(CONFIG_TREE_RCU)
#include <linux_rcutree.h>
#elif defined(CONFIG_TREE_PREEMPT_RCU) || defined(CONFIG_TINY_PREEMPT_RCU)
#include <linux_rcutree.h>
#include <linux_rcutiny.h>
#elif defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU) || defined(CONFIG_RCU_TRACE)
#include <linux_rcutree.h>
#elif defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU)
#include <linux_rcutree.h>
#elif defined(CONFIG_TINY_RCU) || defined(CONFIG_TINY_PREEMPT_RCU)
#include <linux_rcutiny.h>
#else
#include <linux_rcutree.h>
#include <linux_rcutiny.h>
#endif

This fixed the problem with: #error "Unknown RCU implementation specified to kernel configuration"