From 991d2f84256a50f00c16e5aed4d97e47736c79c2 Mon Sep 17 00:00:00 2001 From: Ingo Oeser Date: Wed, 19 Sep 2007 19:11:41 +0800 Subject: [PATCH] --- yaml --- r: 67027 b: refs/heads/master c: 5aaff0c8f7dd3515c9f1ca57f86463f30779acc7 h: refs/heads/master i: 67025: 3145de51add429c9d5b9edab707e0be1185b4c06 67023: 2aa3560294ae0d86236064afee8515c2fe5ae2e4 v: v3 --- [refs] | 2 +- trunk/crypto/blkcipher.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a695b31781af..e612c20111c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70dec235d8ac8cfb56ed2a3597e7d6c5b801f018 +refs/heads/master: 5aaff0c8f7dd3515c9f1ca57f86463f30779acc7 diff --git a/trunk/crypto/blkcipher.c b/trunk/crypto/blkcipher.c index 5991c53eabac..9c49770837c2 100644 --- a/trunk/crypto/blkcipher.c +++ b/trunk/crypto/blkcipher.c @@ -65,7 +65,7 @@ static inline void blkcipher_unmap_dst(struct blkcipher_walk *walk) static inline u8 *blkcipher_get_spot(u8 *start, unsigned int len) { u8 *end_page = (u8 *)(((unsigned long)(start + len - 1)) & PAGE_MASK); - return start > end_page ? start : end_page; + return max(start, end_page); } static inline unsigned int blkcipher_done_slow(struct crypto_blkcipher *tfm,