The patch titled
Remove BUG_ON(unlikely) in include/linux/aio.h
has been added to the -mm tree. Its filename is
remove-bug_onunlikely-in-include-linux-aioh.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
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>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/aio.h | 4 ++--
1 files 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
@@ -217,11 +217,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
include-documentation-for-functions-in-drivers-base-classc.patch
fix-parameter-names-in-drivers-base-classc.patch
fix-kerneldoc-comments-in-kernel-timerc.patch
fix-kerneldoc-comments-in-kernel-timerc-fix.patch
move-valid_dma_direction-from-x86_64-to-generic-code.patch
move-valid_dma_direction-from-x86_64-to-generic-code-fix.patch
use-valid_dma_direction-in-include-asm-i386-dma-mappingh.patch
cdev-documentation-was-drop-second-arg-of-unregister_chrdev.patch
return-better-error-codes-if-drivers-char-rawc-module-init-fails.patch
remove-superfluous-call-to-call-to-cdev_del.patch
remove-bug_onunlikely-in-include-linux-aioh.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
