b3f95490b9
This adds initial support for kernel 4.14 based on the patches for kernel 4.9. In the configuration I deactivated some of the new possible security features like: CONFIG_REFCOUNT_FULL CONFIG_SLAB_FREELIST_HARDENED CONFIG_SOFTLOCKUP_DETECTOR CONFIG_WARN_ALL_UNSEEDED_RANDOM And these overlay FS options are also deactivated: CONFIG_OVERLAY_FS_INDEX CONFIG_OVERLAY_FS_REDIRECT_DIR I activated this: CONFIG_FORTIFY_SOURCE CONFIG_POSIX_TIMERS CONFIG_SLAB_MERGE_DEFAULT CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED I am not sure if I did the porting correct for the following patches: target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch target/linux/generic/hack-4.14/220-gc_sections.patch target/linux/generic/hack-4.14/321-powerpc_crtsavres_prereq.patch target/linux/generic/pending-4.14/305-mips_module_reloc.patch target/linux/generic/pending-4.14/611-netfilter_match_bypass_default_table.patch target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Subject: block2mtd
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
drivers/mtd/devices/block2mtd.c | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/mtd/devices/block2mtd.c
|
|
+++ b/drivers/mtd/devices/block2mtd.c
|
|
@@ -392,7 +392,7 @@ static int block2mtd_setup2(const char *
|
|
/* 80 for device, 12 for erase size, 80 for name, 8 for timeout */
|
|
char buf[80 + 12 + 80 + 8];
|
|
char *str = buf;
|
|
- char *token[3];
|
|
+ char *token[4];
|
|
char *name;
|
|
size_t erase_size = PAGE_SIZE;
|
|
unsigned long timeout = MTD_DEFAULT_TIMEOUT;
|
|
@@ -406,7 +406,7 @@ static int block2mtd_setup2(const char *
|
|
strcpy(str, val);
|
|
kill_final_newline(str);
|
|
|
|
- for (i = 0; i < 3; i++)
|
|
+ for (i = 0; i < 4; i++)
|
|
token[i] = strsep(&str, ",");
|
|
|
|
if (str) {
|
|
@@ -435,6 +435,9 @@ static int block2mtd_setup2(const char *
|
|
if (token[2] && (strlen(token[2]) + 1 > 80))
|
|
pr_err("mtd device name too long\n");
|
|
|
|
+ if (token[3] && kstrtoul(token[3], 0, &timeout))
|
|
+ pr_err("invalid timeout\n");
|
|
+
|
|
add_device(name, erase_size, token[2], timeout);
|
|
|
|
return 0;
|
|
@@ -469,7 +472,7 @@ static int block2mtd_setup(const char *v
|
|
|
|
|
|
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
|
|
-MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
|
|
+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>[,<timeout>]]]\"");
|
|
|
|
static int __init block2mtd_init(void)
|
|
{
|