| 1 | Index: linux-3.0.3/arch/mips/lantiq/prom.c |
| 2 | =================================================================== |
| 3 | --- linux-3.0.3.orig/arch/mips/lantiq/prom.c 2011-10-02 15:49:12.000000000 +0200 |
| 4 | +++ linux-3.0.3/arch/mips/lantiq/prom.c 2011-10-02 15:50:34.614270672 +0200 |
| 5 | @@ -43,6 +43,34 @@ |
| 6 | { |
| 7 | } |
| 8 | |
| 9 | +#ifdef CONFIG_IMAGE_CMDLINE_HACK |
| 10 | +extern char __image_cmdline[]; |
| 11 | + |
| 12 | +static void __init |
| 13 | +prom_init_image_cmdline(void) |
| 14 | +{ |
| 15 | + char *p = __image_cmdline; |
| 16 | + int replace = 0; |
| 17 | + |
| 18 | + if (*p == '-') { |
| 19 | + replace = 1; |
| 20 | + p++; |
| 21 | + } |
| 22 | + |
| 23 | + if (*p == '\0') |
| 24 | + return; |
| 25 | + |
| 26 | + if (replace) { |
| 27 | + strlcpy(arcs_cmdline, p, sizeof(arcs_cmdline)); |
| 28 | + } else { |
| 29 | + strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline)); |
| 30 | + strlcat(arcs_cmdline, p, sizeof(arcs_cmdline)); |
| 31 | + } |
| 32 | +} |
| 33 | +#else |
| 34 | +static void __init prom_init_image_cmdline(void) { return; } |
| 35 | +#endif |
| 36 | + |
| 37 | static void __init prom_init_cmdline(void) |
| 38 | { |
| 39 | int argc = fw_arg0; |
| 40 | @@ -59,6 +87,7 @@ |
| 41 | strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline)); |
| 42 | } |
| 43 | } |
| 44 | + prom_init_image_cmdline(); |
| 45 | } |
| 46 | |
| 47 | void __iomem *ltq_remap_resource(struct resource *res) |
| 48 | |
