diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-05-20 10:17:21 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-20 10:17:21 +0100 |
| commit | 6c8b44abc86a3e23dd1a22c0ee187f06bd7c7f5d (patch) | |
| tree | 8b40f20e9c0dda7a52a39a14d131684d3549a3d3 | |
| parent | 5fc3dbc418e01345e25e96b3192a1c46051c3fdc (diff) | |
| download | linux-6c8b44abc86a3e23dd1a22c0ee187f06bd7c7f5d.tar.bz2 | |
[MTD] Avoid 64-bit division in mtdconcat
WARNING: "__moddi3" [drivers/mtd/mtdconcat.ko] undefined!
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
| -rw-r--r-- | drivers/mtd/mtdconcat.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c index b7de90845c2d..3c61a980c56c 100644 --- a/drivers/mtd/mtdconcat.c +++ b/drivers/mtd/mtdconcat.c @@ -19,6 +19,8 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/concat.h> +#include <asm/div64.h> + /* * Our storage structure: * Subdev points to an array of pointers to struct mtd_info objects @@ -276,9 +278,11 @@ concat_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs, return -EINVAL; /* Check alignment */ - if (mtd->oobblock > 1) - if ((to % mtd->oobblock) || (total_len % mtd->oobblock)) + if (mtd->oobblock > 1) { + loff_t __to = to; + if (do_div(__to, mtd->oobblock) || (total_len % mtd->oobblock)) return -EINVAL; + } /* make a copy of vecs */ vecs_copy = kmalloc(sizeof(struct kvec) * count, GFP_KERNEL); |