- add-warn_on_secs-macro-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     do not check condition twice in WARN_ON_SECS
has been removed from the -mm tree.  Its filename was
     add-warn_on_secs-macro-fix.patch

This patch was dropped because it was folded into add-warn_on_secs-macro.patch

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: do not check condition twice in WARN_ON_SECS
From: Dave Young <hidave.darkstar@xxxxxxxxx>

Don't check condition twice, change WARN_ON(condition) to WARN_ON(1) Thanks
Marcin Slusarz for pointing this out.

Signed-off-by: Dave Young <hidave.darkstar@xxxxxxxxx>
Cc: Marcin Slusarz <marcin.slusarz@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 include/asm-generic/bug.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff -puN include/asm-generic/bug.h~add-warn_on_secs-macro-fix include/asm-generic/bug.h
--- a/include/asm-generic/bug.h~add-warn_on_secs-macro-fix
+++ a/include/asm-generic/bug.h
@@ -80,7 +80,8 @@ extern void warn_on_slowpath(const char 
 	int __ret_warn_on = !!(condition);			\
 	if (unlikely(__ret_warn_on))				\
 		if (__ratelimit(secs * HZ, 1))			\
-			WARN_ON(condition);			\
+			WARN_ON(1);				\
+	unlikely(__ret_warn_on);				\
 })
 
 #ifdef CONFIG_SMP
_

Patches currently in -mm which might be from hidave.darkstar@xxxxxxxxx are

origin.patch
add-time_is_after_jiffies-and-others-which-compare-with-jiffies.patch
isolate-ratelimit-from-printkc-for-other-use.patch
isolate-ratelimit-from-printkc-for-other-use-update.patch
add-warn_on_secs-macro.patch
add-warn_on_secs-macro-fix.patch
add-warn_on_secs-macro-fix-fix.patch
use-warn_on_secs-in-rcupreempth.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux