diff mbox

[U-Boot,5/5] yaffs2: Use lldiv for 64bit division

Message ID 1386272919-22615-5-git-send-email-trini@ti.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Tom Rini Dec. 5, 2013, 7:48 p.m. UTC 
Signed-off-by: Tom Rini <trini@ti.com>
---
 fs/yaffs2/yaffs_uboot_glue.c |    3 ++-
 fs/yaffs2/yaffsfs.c          |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

Comments

Tom Rini Dec. 16, 2013, 2:16 p.m. UTC | #1 
On Thu, Dec 05, 2013 at 02:48:39PM -0500, Tom Rini wrote:

> Signed-off-by: Tom Rini <trini@ti.com>
> 
> ---
> fs/yaffs2/yaffs_uboot_glue.c |    3 ++-
>  fs/yaffs2/yaffsfs.c          |    5 +++--
>  2 files changed, 5 insertions(+), 3 deletions(-)

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/fs/yaffs2/yaffs_uboot_glue.c b/fs/yaffs2/yaffs_uboot_glue.c
index e113e40..50000a1 100644
--- a/fs/yaffs2/yaffs_uboot_glue.c
+++ b/fs/yaffs2/yaffs_uboot_glue.c
@@ -20,6 +20,7 @@ 
  */
 
 #include <common.h>
+#include <div64.h>
 
 #include <config.h>
 #include "nand.h"
@@ -184,7 +185,7 @@  void cmd_yaffs_devconfig(char *_mp, int flash_dev,
 	}
 
 	if (end_block == 0)
-		end_block = mtd->size / mtd->erasesize - 1;
+		end_block = lldiv(mtd->size, mtd->erasesize - 1);
 
 	if (end_block < start_block) {
 		printf("Bad start/end\n");
diff --git a/fs/yaffs2/yaffsfs.c b/fs/yaffs2/yaffsfs.c
index ac4a010..334598e 100644
--- a/fs/yaffs2/yaffsfs.c
+++ b/fs/yaffs2/yaffsfs.c
@@ -11,6 +11,7 @@ 
  * published by the Free Software Foundation.
  */
 
+#include <div64.h>
 #include "yaffsfs.h"
 #include "yaffs_guts.h"
 #include "yaffscfg.h"
@@ -1603,8 +1604,8 @@  static int yaffsfs_DoStat(struct yaffs_obj *obj, struct yaffs_stat *buf)
 		buf->st_rdev = obj->yst_rdev;
 		buf->st_size = yaffs_get_obj_length(obj);
 		buf->st_blksize = obj->my_dev->data_bytes_per_chunk;
-		buf->st_blocks = (buf->st_size + buf->st_blksize - 1) /
-		    buf->st_blksize;
+		buf->st_blocks = lldiv(buf->st_size + buf->st_blksize - 1,
+		    buf->st_blksize);
 #if CONFIG_YAFFS_WINCE
 		buf->yst_wince_atime[0] = obj->win_atime[0];
 		buf->yst_wince_atime[1] = obj->win_atime[1];