Patch for prom envp

Patch for prom envp

[Karl Lessard]

[-- Attachment #1: Type: text/plain, Size: 150 bytes --]

Hi,

this small patch fix some heavy crashes when a board bootup and tries to
use the vector argument as the environnement variable.

Thanks,
Karl




[-- Attachment #2: prom-envp.patch --]
[-- Type: text/plain, Size: 1504 bytes --]

diff -urp linux-mips/arch/mips/au1000/pb1100/init.c linux/arch/mips/au1000/pb1100/init.c
--- linux-mips/arch/mips/au1000/pb1100/init.c	Mon Nov 17 20:17:46 2003
+++ linux/arch/mips/au1000/pb1100/init.c	Thu Oct 14 10:11:42 2004
@@ -53,7 +53,7 @@ void __init prom_init(void)
 
 	prom_argc = fw_arg0;
 	prom_argv = (char **) fw_arg1;
-	prom_envp = (int *) fw_arg3;
+	prom_envp = (int *) fw_arg2;
 
 	mips_machgroup = MACH_GROUP_ALCHEMY;
 	mips_machtype = MACH_PB1100;
diff -urp linux-mips/arch/mips/ite-boards/ivr/init.c linux/arch/mips/ite-boards/ivr/init.c
--- linux-mips/arch/mips/ite-boards/ivr/init.c	Mon Nov 17 20:17:46 2003
+++ linux/arch/mips/ite-boards/ivr/init.c	Thu Oct 14 10:19:09 2004
@@ -60,7 +60,7 @@ void __init prom_init(void)
 
 	prom_argc = fw_arg0;
 	prom_argv = (char **) fw_arg1;
-	prom_envp = (int *) fw_arg3;
+	prom_envp = (int *) fw_arg2;
 
 	mips_machgroup = MACH_GROUP_GLOBESPAN;
 	mips_machtype = MACH_IVR;  /* Globespan's iTVC15 reference board */
diff -urp linux-mips/arch/mips/ite-boards/qed-4n-s01b/init.c linux/arch/mips/ite-boards/qed-4n-s01b/init.c
--- linux-mips/arch/mips/ite-boards/qed-4n-s01b/init.c	Mon Nov 17 20:17:46 2003
+++ linux/arch/mips/ite-boards/qed-4n-s01b/init.c	Thu Oct 14 10:19:33 2004
@@ -60,7 +60,7 @@ void __init prom_init(void)
 
 	prom_argc = fw_arg0;
 	prom_argv = (char **) fw_arg1;
-	prom_envp = (int *) fw_arg3;
+	prom_envp = (int *) fw_arg2;
 
 	mips_machgroup = MACH_GROUP_ITE;
 	mips_machtype = MACH_QED_4N_S01B;  /* ITE board name/number */

Re: Patch for prom envp

[Karl Lessard]

[-- Attachment #1: Type: text/plain, Size: 81 bytes --]

Oups, use this one instead, it takes care of removing the warnings also...

Karl

[-- Attachment #2: prom-envp-1.patch --]
[-- Type: text/plain, Size: 1509 bytes --]

diff -urp linux-mips/arch/mips/au1000/pb1100/init.c linux/arch/mips/au1000/pb1100/init.c
--- linux-mips/arch/mips/au1000/pb1100/init.c	Mon Nov 17 20:17:46 2003
+++ linux/arch/mips/au1000/pb1100/init.c	Thu Oct 14 10:58:35 2004
@@ -53,7 +53,7 @@ void __init prom_init(void)
 
 	prom_argc = fw_arg0;
 	prom_argv = (char **) fw_arg1;
-	prom_envp = (int *) fw_arg3;
+	prom_envp = (char **) fw_arg2;
 
 	mips_machgroup = MACH_GROUP_ALCHEMY;
 	mips_machtype = MACH_PB1100;
diff -urp linux-mips/arch/mips/ite-boards/ivr/init.c linux/arch/mips/ite-boards/ivr/init.c
--- linux-mips/arch/mips/ite-boards/ivr/init.c	Mon Nov 17 20:17:46 2003
+++ linux/arch/mips/ite-boards/ivr/init.c	Thu Oct 14 10:59:35 2004
@@ -60,7 +60,7 @@ void __init prom_init(void)
 
 	prom_argc = fw_arg0;
 	prom_argv = (char **) fw_arg1;
-	prom_envp = (int *) fw_arg3;
+	prom_envp = (char **) fw_arg2;
 
 	mips_machgroup = MACH_GROUP_GLOBESPAN;
 	mips_machtype = MACH_IVR;  /* Globespan's iTVC15 reference board */
diff -urp linux-mips/arch/mips/ite-boards/qed-4n-s01b/init.c linux/arch/mips/ite-boards/qed-4n-s01b/init.c
--- linux-mips/arch/mips/ite-boards/qed-4n-s01b/init.c	Mon Nov 17 20:17:46 2003
+++ linux/arch/mips/ite-boards/qed-4n-s01b/init.c	Thu Oct 14 11:00:14 2004
@@ -60,7 +60,7 @@ void __init prom_init(void)
 
 	prom_argc = fw_arg0;
 	prom_argv = (char **) fw_arg1;
-	prom_envp = (int *) fw_arg3;
+	prom_envp = (char **) fw_arg2;
 
 	mips_machgroup = MACH_GROUP_ITE;
 	mips_machtype = MACH_QED_4N_S01B;  /* ITE board name/number */