qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

kernel: wrong image_cmdline patches has been sent by accidentaly, replace them

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17570 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg
2009-09-11 08:15:55 +00:00
parent 50abbed98f
commit 978a5fb741
4 changed files with 0 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
target/linux/generic-2.6/patches-2.6.27/021-mips_image_cmdline_hack.patch
View File

@@ -1,34 +1,3 @@
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -545,8 +545,28 @@ static void __init resource_init(void)
}
}
+#ifdef CONFIG_IMAGE_CMDLINE_HACK
+static void __init process__image_cmdline(void)
+{
+ extern char __image_cmdline[];
+
+ if (__image_cmdline[0] == '\0')
+ return;
+
+ if (__image_cmdline[0] == '-') {
+ strlcpy(arcs_cmdline, __image_cmdline, sizeof(arcs_cmdline));
+ } else {
+ strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
+ strlcat(arcs_cmdline, __image_cmdline, sizeof(arcs_cmdline));
+ }
+}
+#else
+static void inline process__image_cmdline(void) {}
+#endif
+
void __init setup_arch(char **cmdline_p)
{
+ process__image_cmdline();
cpu_probe();
prom_init();
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -771,6 +771,10 @@ config SYNC_R4K @@ -771,6 +771,10 @@ config SYNC_R4K

31
target/linux/generic-2.6/patches-2.6.28/021-mips_image_cmdline_hack.patch
View File

@@ -1,34 +1,3 @@
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -545,8 +545,28 @@ static void __init resource_init(void)
}
}
+#ifdef CONFIG_IMAGE_CMDLINE_HACK
+static void __init process__image_cmdline(void)
+{
+ extern char __image_cmdline[];
+
+ if (__image_cmdline[0] == '\0')
+ return;
+
+ if (__image_cmdline[0] == '-') {
+ strlcpy(arcs_cmdline, __image_cmdline, sizeof(arcs_cmdline));
+ } else {
+ strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
+ strlcat(arcs_cmdline, __image_cmdline, sizeof(arcs_cmdline));
+ }
+}
+#else
+static void inline process__image_cmdline(void) {}
+#endif
+
void __init setup_arch(char **cmdline_p)
{
+ process__image_cmdline();
cpu_probe();
prom_init();
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -766,6 +766,10 @@ config SYNC_R4K @@ -766,6 +766,10 @@ config SYNC_R4K

31
target/linux/generic-2.6/patches-2.6.30/021-mips_image_cmdline_hack.patch
View File

@@ -1,34 +1,3 @@
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -546,8 +546,28 @@ static void __init resource_init(void)
}
}
+#ifdef CONFIG_IMAGE_CMDLINE_HACK
+static void __init process__image_cmdline(void)
+{
+ extern char __image_cmdline[];
+
+ if (__image_cmdline[0] == '\0')
+ return;
+
+ if (__image_cmdline[0] == '-') {
+ strlcpy(arcs_cmdline, __image_cmdline, sizeof(arcs_cmdline));
+ } else {
+ strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
+ strlcat(arcs_cmdline, __image_cmdline, sizeof(arcs_cmdline));
+ }
+}
+#else
+static void inline process__image_cmdline(void) {}
+#endif
+
void __init setup_arch(char **cmdline_p)
{
+ process__image_cmdline();
cpu_probe();
prom_init();
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -806,6 +806,10 @@ config SYNC_R4K @@ -806,6 +806,10 @@ config SYNC_R4K

31
target/linux/generic-2.6/patches-2.6.31/021-mips_image_cmdline_hack.patch
View File

@@ -1,34 +1,3 @@
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -546,8 +546,28 @@ static void __init resource_init(void)
}
}
+#ifdef CONFIG_IMAGE_CMDLINE_HACK
+static void __init process__image_cmdline(void)
+{
+ extern char __image_cmdline[];
+
+ if (__image_cmdline[0] == '\0')
+ return;
+
+ if (__image_cmdline[0] == '-') {
+ strlcpy(arcs_cmdline, __image_cmdline, sizeof(arcs_cmdline));
+ } else {
+ strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
+ strlcat(arcs_cmdline, __image_cmdline, sizeof(arcs_cmdline));
+ }
+}
+#else
+static void inline process__image_cmdline(void) {}
+#endif
+
void __init setup_arch(char **cmdline_p)
{
+ process__image_cmdline();
cpu_probe();
prom_init();
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -840,6 +840,10 @@ config SYNC_R4K @@ -840,6 +840,10 @@ config SYNC_R4K