kernel: update 3.10 to 3.10.10
[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.10 / 997-device_tree_cmdline.patch
1 --- a/drivers/of/fdt.c
2 +++ b/drivers/of/fdt.c
3 @@ -679,6 +679,9 @@ int __init early_init_dt_scan_chosen(uns
4 p = of_get_flat_dt_prop(node, "bootargs", &l);
5 if (p != NULL && l > 0)
6 strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
7 + p = of_get_flat_dt_prop(node, "bootargs-append", &l);
8 + if (p != NULL && l > 0)
9 + strlcat(data, p, min(strlen(data) + (int)l, COMMAND_LINE_SIZE));
10
11 /*
12 * CONFIG_CMDLINE is meant to be a default in case nothing else