summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro Mery <amery@geeks.cl>2012-10-31 08:21:33 +0000
committerAnatolij Gustschin <agust@denx.de>2012-11-14 13:18:41 +0100
commit624c721f0c6e42368cc1b466dbaa540dd3014295 (patch)
tree6a4a4f7e4711aaf826b4087c591c0e2e045172cc
parentd858c335bf4f7e9eb0b1dd521a4bd6487a27cd54 (diff)
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>
-rw-r--r--fs/zfs/zfs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c
index 2db45b19286..1b73244c004 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;