aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/043-UBI-block-Use-u64-for-the-64-bit-dividend.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-06-11 12:59:15 +0000
committerJohn Crispin <john@openwrt.org>2014-06-11 12:59:15 +0000
commitc8d472c37f07e3a0d7a5ba05ec3b7538a72ad81c (patch)
tree038631553628aa0beb963792b5dc13454bbead28 /target/linux/generic/patches-3.10/043-UBI-block-Use-u64-for-the-64-bit-dividend.patch
parentacbcd5f5b5465b28f966abd7f8da98062ba09935 (diff)
downloadupstream-c8d472c37f07e3a0d7a5ba05ec3b7538a72ad81c.tar.gz
upstream-c8d472c37f07e3a0d7a5ba05ec3b7538a72ad81c.tar.bz2
upstream-c8d472c37f07e3a0d7a5ba05ec3b7538a72ad81c.zip
kernel: backport the ubiblock patches from 3.14->3.10
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 41120
Diffstat (limited to 'target/linux/generic/patches-3.10/043-UBI-block-Use-u64-for-the-64-bit-dividend.patch')
-rw-r--r--target/linux/generic/patches-3.10/043-UBI-block-Use-u64-for-the-64-bit-dividend.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.10/043-UBI-block-Use-u64-for-the-64-bit-dividend.patch b/target/linux/generic/patches-3.10/043-UBI-block-Use-u64-for-the-64-bit-dividend.patch
new file mode 100644
index 0000000000..648b42f67d
--- /dev/null
+++ b/target/linux/generic/patches-3.10/043-UBI-block-Use-u64-for-the-64-bit-dividend.patch
@@ -0,0 +1,33 @@
+From 9981e14ab2f7c6a4d2bb45e51a6371964919837d Mon Sep 17 00:00:00 2001
+From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Date: Mon, 3 Mar 2014 13:42:39 -0300
+Subject: [PATCH] UBI: block: Use 'u64' for the 64-bit dividend
+
+Fixes the following warning on ARCH=avr32:
+
+ drivers/mtd/ubi/block.c: In function 'ubiblock_read':
+ drivers/mtd/ubi/block.c:207: warning: comparison of distinct pointer types lacks a cast
+
+Reported-by: kbuild test robot <fengguang.wu@intel.com>
+Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
+---
+ drivers/mtd/ubi/block.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c
+index cd6be98..16e6731 100644
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -201,7 +201,7 @@ static int ubiblock_read(struct ubiblock *dev, char *buffer,
+ int ret, leb, offset;
+ int bytes_left = len;
+ int to_read = len;
+- loff_t pos = sec << 9;
++ u64 pos = sec << 9;
+
+ /* Get LEB:offset address to read from */
+ offset = do_div(pos, dev->leb_size);
+--
+1.9.2
+