diff mbox

[v2] mtd: mtdram: fix build error

Message ID 1443619766-8134-1-git-send-email-sudipm.mukherjee@gmail.com
State Not Applicable
Headers show

Commit Message

Sudip Mukherjee Sept. 30, 2015, 1:29 p.m. UTC
i386 allmodconfig fails with:
ERROR: "__umoddi3" [drivers/mtd/devices/mtdram.ko] undefined!
ERROR: "__moddi3" [drivers/mtd/devices/mtdram.ko] undefined!

arm allmodconfig fails with:
ERROR: "__aeabi_uldivmod" [drivers/mtd/devices/mtdram.ko] undefined!
ERROR: "__aeabi_ldivmod" [drivers/mtd/devices/mtdram.ko] undefined!

mips allmodconfig fails with:
ERROR: "__umoddi3" [drivers/mtd/devices/mtdram.ko] undefined!
ERROR: "__moddi3" [drivers/mtd/devices/mtdram.ko] undefined!

The modulus operation is not being supported by these compilers. Use
do_div() instead which returns the remainder.

Fixes: 7827e3acad2d ("mtd: mtdram: check offs and len in mtdram->erase")
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---

v1 showed build warning with cris and xtensa. I have checked v2 with
arm, cris and xtensa.

 drivers/mtd/devices/mtdram.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Comments

Brian Norris Sept. 30, 2015, 3:51 p.m. UTC | #1
On Wed, Sep 30, 2015 at 06:59:26PM +0530, Sudip Mukherjee wrote:
> i386 allmodconfig fails with:
> ERROR: "__umoddi3" [drivers/mtd/devices/mtdram.ko] undefined!
> ERROR: "__moddi3" [drivers/mtd/devices/mtdram.ko] undefined!
> 
> arm allmodconfig fails with:
> ERROR: "__aeabi_uldivmod" [drivers/mtd/devices/mtdram.ko] undefined!
> ERROR: "__aeabi_ldivmod" [drivers/mtd/devices/mtdram.ko] undefined!
> 
> mips allmodconfig fails with:
> ERROR: "__umoddi3" [drivers/mtd/devices/mtdram.ko] undefined!
> ERROR: "__moddi3" [drivers/mtd/devices/mtdram.ko] undefined!
> 
> The modulus operation is not being supported by these compilers. Use
> do_div() instead which returns the remainder.
> 
> Fixes: 7827e3acad2d ("mtd: mtdram: check offs and len in mtdram->erase")
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> ---
> 
> v1 showed build warning with cris and xtensa. I have checked v2 with
> arm, cris and xtensa.

I already reverted the bad patch, so this doesn't apply any more...

If you want to send a squashed patch that redoes this properly, I can
take it.

Brian
Sudip Mukherjee Sept. 30, 2015, 4:26 p.m. UTC | #2
On Wed, Sep 30, 2015 at 08:51:07AM -0700, Brian Norris wrote:
> On Wed, Sep 30, 2015 at 06:59:26PM +0530, Sudip Mukherjee wrote:
> > i386 allmodconfig fails with:
> > ERROR: "__umoddi3" [drivers/mtd/devices/mtdram.ko] undefined!
> > ERROR: "__moddi3" [drivers/mtd/devices/mtdram.ko] undefined!
> > 
> > arm allmodconfig fails with:
> > ERROR: "__aeabi_uldivmod" [drivers/mtd/devices/mtdram.ko] undefined!
> > ERROR: "__aeabi_ldivmod" [drivers/mtd/devices/mtdram.ko] undefined!
> > 
> > mips allmodconfig fails with:
> > ERROR: "__umoddi3" [drivers/mtd/devices/mtdram.ko] undefined!
> > ERROR: "__moddi3" [drivers/mtd/devices/mtdram.ko] undefined!
> > 
> > The modulus operation is not being supported by these compilers. Use
> > do_div() instead which returns the remainder.
> > 
> > Fixes: 7827e3acad2d ("mtd: mtdram: check offs and len in mtdram->erase")
> > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
> > ---
> > 
> > v1 showed build warning with cris and xtensa. I have checked v2 with
> > arm, cris and xtensa.
> 
> I already reverted the bad patch, so this doesn't apply any more...
> 
> If you want to send a squashed patch that redoes this properly, I can
> take it.

Ok. Sending the new patch.

regards
sudip
diff mbox

Patch

diff --git a/drivers/mtd/devices/mtdram.c b/drivers/mtd/devices/mtdram.c
index 73fa297..21b6a05 100644
--- a/drivers/mtd/devices/mtdram.c
+++ b/drivers/mtd/devices/mtdram.c
@@ -35,15 +35,21 @@  static struct mtd_info *mtd_info;
 static int check_offs_len(struct mtd_info *mtd, loff_t ofs, uint64_t len)
 {
 	int ret = 0;
+	uint64_t temp_len, rem;
 
 	/* Start address must align on block boundary */
-	if (ofs % mtd->erasesize) {
+	temp_len = ofs;
+	rem = do_div(temp_len, mtd->erasesize);
+	if (rem) {
 		pr_debug("%s: unaligned address\n", __func__);
 		ret = -EINVAL;
 	}
 
 	/* Length must align on block boundary */
-	if (len % mtd->erasesize) {
+	temp_len = len;
+	rem = do_div(temp_len, mtd->erasesize);
+
+	if (rem) {
 		pr_debug("%s: length not block aligned\n", __func__);
 		ret = -EINVAL;
 	}