summaryrefslogtreecommitdiffstats
path: root/target/linux/x86/patches-3.18/012-export_erase_write.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-15 04:43:30 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-15 04:43:30 +0000
commitc062741575f4c61416b5ca6542a74db2f0052fc0 (patch)
tree65f725859f09237ed3242badf262dca7906fee39 /target/linux/x86/patches-3.18/012-export_erase_write.patch
parent50d4775df04445d138b72964efff1773f507e139 (diff)
downloadmaster-31e0f0ae-c062741575f4c61416b5ca6542a74db2f0052fc0.tar.gz
master-31e0f0ae-c062741575f4c61416b5ca6542a74db2f0052fc0.tar.bz2
master-31e0f0ae-c062741575f4c61416b5ca6542a74db2f0052fc0.zip
x86: update to kernel 3.18
copied target/linux/x86/config-3.14 and target/linux/x86/patches-3.14 to 3.18 equivalents and then tweaked until it built. Tested on alix2, soekris net4826 and soekris net4521. Still having trouble with net4826 booting from Grub, alix2 and net4521 are fine. Signed-off-by: Russell Senior <russell@personaltelco.net> SVN-Revision: 44758
Diffstat (limited to 'target/linux/x86/patches-3.18/012-export_erase_write.patch')
-rw-r--r--target/linux/x86/patches-3.18/012-export_erase_write.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/target/linux/x86/patches-3.18/012-export_erase_write.patch b/target/linux/x86/patches-3.18/012-export_erase_write.patch
new file mode 100644
index 0000000000..9927384cb8
--- /dev/null
+++ b/target/linux/x86/patches-3.18/012-export_erase_write.patch
@@ -0,0 +1,23 @@
+--- a/drivers/mtd/mtdblock.c
++++ b/drivers/mtd/mtdblock.c
+@@ -63,7 +63,7 @@ static void erase_callback(struct erase_
+ wake_up(wait_q);
+ }
+
+-static int erase_write (struct mtd_info *mtd, unsigned long pos,
++int erase_write (struct mtd_info *mtd, unsigned long pos,
+ int len, const char *buf)
+ {
+ struct erase_info erase;
+--- a/include/linux/mtd/mtd.h
++++ b/include/linux/mtd/mtd.h
+@@ -414,6 +414,9 @@ extern void register_mtd_user (struct mt
+ extern int unregister_mtd_user (struct mtd_notifier *old);
+ void *mtd_kmalloc_up_to(const struct mtd_info *mtd, size_t *size);
+
++int erase_write (struct mtd_info *mtd, unsigned long pos,
++ int len, const char *buf);
++
+ void mtd_erase_callback(struct erase_info *instr);
+
+ static inline int mtd_is_bitflip(int err) {