[S390] dcss: Fix Unlikely(x) != y

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Linux Kernel Mailing List
Date: Tuesday, February 19, 2008 - 11:03 am

Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=39f73b...
Commit:     39f73b2886be3a255d8f4cd669c8c7e7957afbd9
Parent:     d082d3ce32705a92bd86c2b061d6b0827a40a5b1
Author:     Roel Kluin <12o3l@tiscali.nl>
AuthorDate: Tue Feb 19 15:29:33 2008 +0100
Committer:  Martin Schwidefsky <schwidefsky@de.ibm.com>
CommitDate: Tue Feb 19 15:29:35 2008 +0100

    [S390] dcss: Fix Unlikely(x) != y
    
    Fix Unlikely(x) != y
    
    Cc: Gerald Schaefer <geraldsc@de.ibm.com>
    Cc: Stefan Weinhuber <wein@de.ibm.com>
    Cc: Carsten Otte <cotte@de.ibm.com>
    Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---
 drivers/s390/block/dcssblk.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 3faf053..e6c94db 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -666,7 +666,7 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio)
 		page_addr = (unsigned long)
 			page_address(bvec->bv_page) + bvec->bv_offset;
 		source_addr = dev_info->start + (index<<12) + bytes_done;
-		if (unlikely(page_addr & 4095) != 0 || (bvec->bv_len & 4095) != 0)
+		if (unlikely((page_addr & 4095) != 0) || (bvec->bv_len & 4095) != 0)
 			// More paranoia.
 			goto fail;
 		if (bio_data_dir(bio) == READ) {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[S390] dcss: Fix Unlikely(x) != y, Linux Kernel Mailing ..., (Tue Feb 19, 11:03 am)