From: Alejandro Mery <amery@geeks.cl>
Date: Wed, 31 Oct 2012 08:21:33 +0000 (+0000)
Subject: fs: zfs: fix illegal use of fp
X-Git-Tag: v2013.01-rc2~140^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=624c721f0c6e42368cc1b466dbaa540dd3014295;p=oweals%2Fu-boot.git

fs: zfs: fix illegal use of fp

the upcoming sunxi (allwinner a10/a13) platform enables zfs
by default, and using linaro's hf -msoft-float makes the build
fail because this u64 division.

Signed-off-by: Alejandro Mery <amery@geeks.cl>
Acked-by: Stefan Roese <sr@denx.de>
---

diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index 2db45b1928..1b73244c00 100644
--- a/fs/zfs/zfs.c
+++ b/fs/zfs/zfs.c
@@ -30,6 +30,7 @@
 #include <linux/ctype.h>
 #include <asm/byteorder.h>
 #include "zfs_common.h"
+#include "div64.h"
 
 block_dev_desc_t *zfs_dev_desc;
 
@@ -2115,7 +2116,8 @@ zfs_read(zfs_file_t file, char *buf, uint64_t len)
 		/*
 		 * Find requested blkid and the offset within that block.
 		 */
-		uint64_t blkid = (file->offset + red) /	 blksz;
+		uint64_t blkid = file->offset + red;
+		blkid = do_div(blkid, blksz);
 		free(data->file_buf);
 		data->file_buf = 0;