From: Dave Young <hidave.darkstar@gmail.com>

Change to the concise version as suggestion of Johannes Weiner.

Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
Cc: Johannes Weiner <hannes@saeurebad.de>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/asm-generic/bug.h |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff -puN include/asm-generic/bug.h~add-warn_on_secs-macro-simplification include/asm-generic/bug.h
--- a/include/asm-generic/bug.h~add-warn_on_secs-macro-simplification
+++ a/include/asm-generic/bug.h
@@ -76,13 +76,8 @@ extern void warn_on_slowpath(const char 
 	unlikely(__ret_warn_once);				\
 })
 
-#define WARN_ON_SECS(condition, secs) ({			\
-	int __ret_warn_on = !!(condition);			\
-	if (unlikely(__ret_warn_on))				\
-		if (__ratelimit(secs * HZ, 1))			\
-			WARN_ON(1);				\
-	unlikely(__ret_warn_on);				\
-})
+#define WARN_ON_SECS(condition, secs)				\
+		WARN_ON((condition && __ratelimit(secs * HZ, 1)))
 
 #ifdef CONFIG_SMP
 # define WARN_ON_SMP(x)			WARN_ON(x)
_