aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14/042-UBI-block-Mark-init-only-symbol-as-__initdata.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-06-11 12:59:06 +0000
committerJohn Crispin <john@openwrt.org>2014-06-11 12:59:06 +0000
commitd494983d020035cacd8d8023afad22d2761fa7fc (patch)
treefd94c75873c35abbaebf7fd3e12f093e147ce4f1 /target/linux/generic/patches-3.14/042-UBI-block-Mark-init-only-symbol-as-__initdata.patch
parentba59fab9bbafce7754ef426d267e6ad9f381ed73 (diff)
downloadupstream-d494983d020035cacd8d8023afad22d2761fa7fc.tar.gz
upstream-d494983d020035cacd8d8023afad22d2761fa7fc.tar.bz2
upstream-d494983d020035cacd8d8023afad22d2761fa7fc.zip
kernel: backport ubiblock support from 3.15
Backport ubiblock support from kernel 3.15 as well as all follow-up fixes related to ubiblock. Signed-off-by: Daniel Golle <daniel@makrotopia.org> create mode 100644 target/linux/generic/patches-3.14/040-UBI-R-O-block-driver-on-top-of-UBI-volumes.patch create mode 100644 target/linux/generic/patches-3.14/041-UBI-block-do-not-use-term-attach.patch create mode 100644 target/linux/generic/patches-3.14/042-UBI-block-Mark-init-only-symbol-as-__initdata.patch create mode 100644 target/linux/generic/patches-3.14/043-UBI-block-Use-u64-for-the-64-bit-dividend.patch create mode 100644 target/linux/generic/patches-3.14/044-UBI-rename-block-device-ioctls.patch create mode 100644 target/linux/generic/patches-3.14/045-UBI-block-Remove-__initdata-from-ubiblock_param_ops.patch create mode 100644 target/linux/generic/patches-3.14/046-UBI-avoid-workqueue-format-string-leak.patch create mode 100644 target/linux/generic/patches-3.14/047-UBI-make-UBI_IOCVOLCRBLK-take-a-parameter-for-future.patch SVN-Revision: 41118
Diffstat (limited to 'target/linux/generic/patches-3.14/042-UBI-block-Mark-init-only-symbol-as-__initdata.patch')
-rw-r--r--target/linux/generic/patches-3.14/042-UBI-block-Mark-init-only-symbol-as-__initdata.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.14/042-UBI-block-Mark-init-only-symbol-as-__initdata.patch b/target/linux/generic/patches-3.14/042-UBI-block-Mark-init-only-symbol-as-__initdata.patch
new file mode 100644
index 0000000000..181cecb4af
--- /dev/null
+++ b/target/linux/generic/patches-3.14/042-UBI-block-Mark-init-only-symbol-as-__initdata.patch
@@ -0,0 +1,42 @@
+From ca2b722d1ab5bc3ffc34b5995248968cd8a7cb6f Mon Sep 17 00:00:00 2001
+From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
+Date: Mon, 3 Mar 2014 13:42:38 -0300
+Subject: [PATCH] UBI: block: Mark init-only symbol as __initdata
+
+ubiblock_param_ops should be marked as __init as it's only used to set
+a driver parameter on insertion time. This commit fixes the following:
+
+ WARNING: drivers/mtd/built-in.o(.text+0x653ac): Section mismatch in
+ reference from the variable ubiblock_param_ops to the function
+ .init.text:ubiblock_set_param()
+
+ The function ubiblock_param_ops() references the function __init
+ ubiblock_set_param(). This is often because ubiblock_param_ops lacks a
+ __init annotation or the annotation of ubiblock_set_param is wrong.
+
+Given gcc errors if the struct is marked const __initdata, this commit
+drops the const mark from it.
+
+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 6402e41..cd6be98 100644
+--- a/drivers/mtd/ubi/block.c
++++ b/drivers/mtd/ubi/block.c
+@@ -156,7 +156,7 @@ static int __init ubiblock_set_param(const char *val,
+ return 0;
+ }
+
+-static const struct kernel_param_ops ubiblock_param_ops = {
++static struct kernel_param_ops ubiblock_param_ops __initdata = {
+ .set = ubiblock_set_param,
+ };
+ module_param_cb(block, &ubiblock_param_ops, NULL, 0);
+--
+1.9.2
+