openwrtv3/target/linux/generic/patches-3.14/997-device_tree_cmdline.patch
Hauke Mehrtens ff12bcef16 kernel: fix some compile warnings with kernel 3.14
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 40734
2014-05-08 21:52:40 +00:00

12 lines
465 B
Diff

--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -817,6 +817,9 @@ int __init early_init_dt_scan_chosen(uns
p = of_get_flat_dt_prop(node, "bootargs", &l);
if (p != NULL && l > 0)
strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
+ p = of_get_flat_dt_prop(node, "bootargs-append", &l);
+ if (p != NULL && l > 0)
+ strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
/*
* CONFIG_CMDLINE is meant to be a default in case nothing else