From ad96cf275274017c69def88cd7b6f037860a63b0 Mon Sep 17 00:00:00 2001
From: Jan Beulich <JBeulich@suse.com>
Date: Fri, 23 Mar 2012 15:01:52 -0700
Subject: [PATCH] --- yaml --- r: 295147 b: refs/heads/master c:
 7ccaba5314caf3a2b1052edb3146ccc969b4d466 h: refs/heads/master i:   295145:
 7c8f9a59b2546436dfdef99493dd5a8a84feb921   295143:
 10f8f60a1512ece58b1360d466edaddbc860ce4a v: v3

---
 [refs]                                  | 2 +-
 trunk/include/asm-generic/bug.h         | 6 +++---
 trunk/include/asm-generic/vmlinux.lds.h | 1 +
 trunk/include/linux/rcupdate.h          | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3e858f38208a..2343b3626589 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10db4e1e4e9a910a26b94045660e5ba7e7c71419
+refs/heads/master: 7ccaba5314caf3a2b1052edb3146ccc969b4d466
diff --git a/trunk/include/asm-generic/bug.h b/trunk/include/asm-generic/bug.h
index 84458b0c38d1..2520a6e241dc 100644
--- a/trunk/include/asm-generic/bug.h
+++ b/trunk/include/asm-generic/bug.h
@@ -134,7 +134,7 @@ extern void warn_slowpath_null(const char *file, const int line);
 #endif
 
 #define WARN_ON_ONCE(condition)	({				\
-	static bool __warned;					\
+	static bool __section(.data.unlikely) __warned;		\
 	int __ret_warn_once = !!(condition);			\
 								\
 	if (unlikely(__ret_warn_once))				\
@@ -144,7 +144,7 @@ extern void warn_slowpath_null(const char *file, const int line);
 })
 
 #define WARN_ONCE(condition, format...)	({			\
-	static bool __warned;					\
+	static bool __section(.data.unlikely) __warned;		\
 	int __ret_warn_once = !!(condition);			\
 								\
 	if (unlikely(__ret_warn_once))				\
@@ -154,7 +154,7 @@ extern void warn_slowpath_null(const char *file, const int line);
 })
 
 #define WARN_TAINT_ONCE(condition, taint, format...)	({	\
-	static bool __warned;					\
+	static bool __section(.data.unlikely) __warned;		\
 	int __ret_warn_once = !!(condition);			\
 								\
 	if (unlikely(__ret_warn_once))				\
diff --git a/trunk/include/asm-generic/vmlinux.lds.h b/trunk/include/asm-generic/vmlinux.lds.h
index b5e2e4c6b017..798603e8ec38 100644
--- a/trunk/include/asm-generic/vmlinux.lds.h
+++ b/trunk/include/asm-generic/vmlinux.lds.h
@@ -167,6 +167,7 @@
 	CPU_KEEP(exit.data)						\
 	MEM_KEEP(init.data)						\
 	MEM_KEEP(exit.data)						\
+	*(.data.unlikely)						\
 	STRUCT_ALIGN();							\
 	*(__tracepoints)						\
 	/* implement dynamic printk debug */				\
diff --git a/trunk/include/linux/rcupdate.h b/trunk/include/linux/rcupdate.h
index 937217425c47..2c62594b67dd 100644
--- a/trunk/include/linux/rcupdate.h
+++ b/trunk/include/linux/rcupdate.h
@@ -418,7 +418,7 @@ extern int rcu_my_thread_group_empty(void);
  */
 #define rcu_lockdep_assert(c, s)					\
 	do {								\
-		static bool __warned;					\
+		static bool __section(.data.unlikely) __warned;		\
 		if (debug_lockdep_rcu_enabled() && !__warned && !(c)) {	\
 			__warned = true;				\
 			lockdep_rcu_suspicious(__FILE__, __LINE__, s);	\