sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Alejandro Mery 2012-10-31 08:21:33 +00:00 committed by Anatolij Gustschin
parent d858c335bf
commit 624c721f0c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/zfs/zfs.c
View File

@ -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;