From 1e009bf2667c7f304ea181974e3e22cb7b6a025b Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 8 Feb 2016 14:18:32 +0100 Subject: [PATCH] mtd: Make erase_info structs 64bit where necessary Make the userspace structs 64bit where necessary. Since we do not have separated kernel/userspace in barebox we can just modifiy the original structs instead of adding separate 64bit structs. Signed-off-by: Sascha Hauer --- drivers/mtd/core.c | 2 +- include/linux/mtd/mtd-abi.h | 8 ++++---- include/linux/mtd/mtd.h | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c index 62307db70..586b4a0ae 100644 --- a/drivers/mtd/core.c +++ b/drivers/mtd/core.c @@ -169,7 +169,7 @@ static int mtd_op_erase(struct cdev *cdev, size_t count, loff_t offset) erase.len = mtd->erasesize; while (count > 0) { - dev_dbg(cdev->dev, "erase %d %d\n", addr, erase.len); + dev_dbg(cdev->dev, "erase 0x%08llx len: 0x%08llx\n", addr, erase.len); if (mtd->allow_erasebad || (mtd->master && mtd->master->allow_erasebad)) ret = 0; diff --git a/include/linux/mtd/mtd-abi.h b/include/linux/mtd/mtd-abi.h index c46605d5e..8e778df17 100644 --- a/include/linux/mtd/mtd-abi.h +++ b/include/linux/mtd/mtd-abi.h @@ -10,13 +10,13 @@ #include struct erase_info_user { - uint32_t start; - uint32_t length; + uint64_t start; + uint64_t length; }; struct mtd_oob_buf { - uint32_t start; - uint32_t length; + uint64_t start; + uint64_t length; unsigned char *ptr; }; diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 7e828bc98..e43021709 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -31,9 +31,9 @@ specific to any particular block. */ struct erase_info { struct mtd_info *mtd; - u_int32_t addr; - u_int32_t len; - u_int32_t fail_addr; + u_int64_t addr; + u_int64_t len; + u_int64_t fail_addr; u_long time; u_long retries; u_int dev; @@ -45,7 +45,7 @@ struct erase_info { }; struct mtd_erase_region_info { - u_int32_t offset; /* At which this region starts, from the beginning of the MTD */ + u_int64_t offset; /* At which this region starts, from the beginning of the MTD */ u_int32_t erasesize; /* For this region */ u_int32_t numblocks; /* Number of blocks of erasesize in this region */ unsigned long *lockmap; /* If keeping bitmap of locks */