- remove-bug_onunlikely-in-include-linux-aioh.patch removed from -mm tree

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

 



The patch titled

     Remove BUG_ON(unlikely) in include/linux/aio.h

has been removed from the -mm tree.  Its filename is

     remove-bug_onunlikely-in-include-linux-aioh.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: Remove BUG_ON(unlikely) in include/linux/aio.h
From: Rolf Eike Beer <eike-kernel@xxxxxxxxx>

BUG_ON() does this unlikely check itself, as bugs in Linux are unlikely
anyway :)

Signed-off-by: Rolf Eike Beer <eike-kernel@xxxxxxxxx>
Acked-by: Zach Brown <zach.brown@xxxxxxxxxx>
Acked-by: Benjamin LaHaise <benjamin.c.lahaise@xxxxxxxxx> 
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 include/linux/aio.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN include/linux/aio.h~remove-bug_onunlikely-in-include-linux-aioh include/linux/aio.h
--- a/include/linux/aio.h~remove-bug_onunlikely-in-include-linux-aioh
+++ a/include/linux/aio.h
@@ -213,11 +213,11 @@ int FASTCALL(io_submit_one(struct kioctx
 				  struct iocb *iocb));
 
 #define get_ioctx(kioctx) do {						\
-	BUG_ON(unlikely(atomic_read(&(kioctx)->users) <= 0));		\
+	BUG_ON(atomic_read(&(kioctx)->users) <= 0);			\
 	atomic_inc(&(kioctx)->users);					\
 } while (0)
 #define put_ioctx(kioctx) do {						\
-	BUG_ON(unlikely(atomic_read(&(kioctx)->users) <= 0));		\
+	BUG_ON(atomic_read(&(kioctx)->users) <= 0);			\
 	if (unlikely(atomic_dec_and_test(&(kioctx)->users))) 		\
 		__put_ioctx(kioctx);					\
 } while (0)
_

Patches currently in -mm which might be from eike-kernel@xxxxxxxxx are

origin.patch
remove-extra-newline-from-info-message.patch
fix-scsi-scsi_transporth-compile-error.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