[PATCH v2 1/1][MIPS] Initialization of Alchemy boards

[PATCH v2 1/1][MIPS] Initialization of Alchemy boards

[Kevin Hickey]

  An earlier update changed some calls from simple_strotl to
strict_strtol but did not account for the differences in the syntax
between the calls.simple_strotl returns the integer; strict_strtol
returns an error code and takes a pointer to the result.  As it was,
NULL was being passed in place of the result, which led to failures
during kernel initialization when using YAMON.

Signed-off-by:  Kevin Hickey <khickey@rmicorp.com>

 arch/mips/au1000/db1x00/init.c  |    2 +-
 arch/mips/au1000/mtx-1/init.c   |    2 +-
 arch/mips/au1000/pb1000/init.c  |    2 +-
 arch/mips/au1000/pb1100/init.c  |    2 +-
 arch/mips/au1000/pb1200/init.c  |    2 +-
 arch/mips/au1000/pb1500/init.c  |    2 +-
 arch/mips/au1000/pb1550/init.c  |    2 +-
 arch/mips/au1000/xxs1500/init.c |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/mips/au1000/db1x00/init.c
b/arch/mips/au1000/db1x00/init.c
index 5ebe0de..8474135 100644
--- a/arch/mips/au1000/db1x00/init.c
+++ b/arch/mips/au1000/db1x00/init.c
@@ -57,6 +57,6 @@ void __init prom_init(void)
 	if (!memsize_str)
 		memsize = 0x04000000;
 	else
-		memsize = strict_strtol(memsize_str, 0, NULL);
+		strict_strtol(memsize_str, 0, &memsize);
 	add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/mtx-1/init.c
b/arch/mips/au1000/mtx-1/init.c
index 33a4aeb..3bae13c 100644
--- a/arch/mips/au1000/mtx-1/init.c
+++ b/arch/mips/au1000/mtx-1/init.c
@@ -55,6 +55,6 @@ void __init prom_init(void)
 	if (!memsize_str)
 		memsize = 0x04000000;
 	else
-		memsize = strict_strtol(memsize_str, 0, NULL);
+		strict_strtol(memsize_str, 0, &memsize);
 	add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/pb1000/init.c
b/arch/mips/au1000/pb1000/init.c
index 3837365..8a9c7d5 100644
--- a/arch/mips/au1000/pb1000/init.c
+++ b/arch/mips/au1000/pb1000/init.c
@@ -52,6 +52,6 @@ void __init prom_init(void)
 	if (!memsize_str)
 		memsize = 0x04000000;
 	else
-		memsize = strict_strtol(memsize_str, 0, NULL);
+		strict_strtol(memsize_str, 0, &memsize);
 	add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/pb1100/init.c
b/arch/mips/au1000/pb1100/init.c
index 8355483..7c67923 100644
--- a/arch/mips/au1000/pb1100/init.c
+++ b/arch/mips/au1000/pb1100/init.c
@@ -54,7 +54,7 @@ void __init prom_init(void)
 	if (!memsize_str)
 		memsize = 0x04000000;
 	else
-		memsize = strict_strtol(memsize_str, 0, NULL);
+		strict_strtol(memsize_str, 0, &memsize);
 
 	add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/pb1200/init.c
b/arch/mips/au1000/pb1200/init.c
index 09fd63b..e9b2a0f 100644
--- a/arch/mips/au1000/pb1200/init.c
+++ b/arch/mips/au1000/pb1200/init.c
@@ -53,6 +53,6 @@ void __init prom_init(void)
 	if (!memsize_str)
 		memsize = 0x08000000;
 	else
-		memsize = strict_strtol(memsize_str, 0, NULL);
+		strict_strtol(memsize_str, 0, &memsize);
 	add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/pb1500/init.c
b/arch/mips/au1000/pb1500/init.c
index 49f51e1..3b6e395 100644
--- a/arch/mips/au1000/pb1500/init.c
+++ b/arch/mips/au1000/pb1500/init.c
@@ -53,6 +53,6 @@ void __init prom_init(void)
 	if (!memsize_str)
 		memsize = 0x04000000;
 	else
-		memsize = strict_strtol(memsize_str, 0, NULL);
+		strict_strtol(memsize_str, 0, &memsize);
 	add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/pb1550/init.c
b/arch/mips/au1000/pb1550/init.c
index 1b5f584..e1055a1 100644
--- a/arch/mips/au1000/pb1550/init.c
+++ b/arch/mips/au1000/pb1550/init.c
@@ -53,6 +53,6 @@ void __init prom_init(void)
 	if (!memsize_str)
 		memsize = 0x08000000;
 	else
-		memsize = strict_strtol(memsize_str, 0, NULL);
+		strict_strtol(memsize_str, 0, &memsize);
 	add_memory_region(0, memsize, BOOT_MEM_RAM);
 }
diff --git a/arch/mips/au1000/xxs1500/init.c
b/arch/mips/au1000/xxs1500/init.c
index b849bf5..7516434 100644
--- a/arch/mips/au1000/xxs1500/init.c
+++ b/arch/mips/au1000/xxs1500/init.c
@@ -53,6 +53,6 @@ void __init prom_init(void)
 	if (!memsize_str)
 		memsize = 0x04000000;
 	else
-		memsize = strict_strtol(memsize_str, 0, NULL);
+		strict_strtol(memsize_str, 0, &memsize);
 	add_memory_region(0, memsize, BOOT_MEM_RAM);
 }

-- 
Kevin Hickey
Alchemy Solutions
RMI Corporation
khickey@RMICorp.com
P: 512.691.8044

Re: [PATCH v2 1/1][MIPS] Initialization of Alchemy boards

[Ralf Baechle]

On Mon, Jul 28, 2008 at 01:09:26PM -0500, Kevin Hickey wrote:

>   An earlier update changed some calls from simple_strotl to
> strict_strtol but did not account for the differences in the syntax
> between the calls.simple_strotl returns the integer; strict_strtol
> returns an error code and takes a pointer to the result.  As it was,
> NULL was being passed in place of the result, which led to failures
> during kernel initialization when using YAMON.
> 
> Signed-off-by:  Kevin Hickey <khickey@rmicorp.com>
> 
>  arch/mips/au1000/db1x00/init.c  |    2 +-
>  arch/mips/au1000/mtx-1/init.c   |    2 +-
>  arch/mips/au1000/pb1000/init.c  |    2 +-
>  arch/mips/au1000/pb1100/init.c  |    2 +-
>  arch/mips/au1000/pb1200/init.c  |    2 +-
>  arch/mips/au1000/pb1500/init.c  |    2 +-
>  arch/mips/au1000/pb1550/init.c  |    2 +-
>  arch/mips/au1000/xxs1500/init.c |    2 +-
>  8 files changed, 8 insertions(+), 8 deletions(-)

One little nit on the submission format - if you include a diffstat, please
put it after a line consisting only of three - like this:

---
 arch/mips/au1000/db1x00/init.c  |    2 +-
 arch/mips/au1000/mtx-1/init.c   |    2 +-
 arch/mips/au1000/pb1000/init.c  |    2 +-

This keeps git and other tools that try to extract the body of the mail
for the description from considering the diffstat as part of the
description.

Patch applied, thanks!

  Ralf

Re: [PATCH v2 1/1][MIPS] Initialization of Alchemy boards

[Kevin Hickey]

Ralf,

On Mon, 2008-07-28 at 23:36 +0100, Ralf Baechle wrote:
> On Mon, Jul 28, 2008 at 01:09:26PM -0500, Kevin Hickey wrote:
> 
> >   An earlier update changed some calls from simple_strotl to
> > strict_strtol but did not account for the differences in the syntax
> > between the calls.simple_strotl returns the integer; strict_strtol
> > returns an error code and takes a pointer to the result.  As it was,
> > NULL was being passed in place of the result, which led to failures
> > during kernel initialization when using YAMON.
> > 
> > Signed-off-by:  Kevin Hickey <khickey@rmicorp.com>
> > 
> >  arch/mips/au1000/db1x00/init.c  |    2 +-
> >  arch/mips/au1000/mtx-1/init.c   |    2 +-
> >  arch/mips/au1000/pb1000/init.c  |    2 +-
> >  arch/mips/au1000/pb1100/init.c  |    2 +-
> >  arch/mips/au1000/pb1200/init.c  |    2 +-
> >  arch/mips/au1000/pb1500/init.c  |    2 +-
> >  arch/mips/au1000/pb1550/init.c  |    2 +-
> >  arch/mips/au1000/xxs1500/init.c |    2 +-
> >  8 files changed, 8 insertions(+), 8 deletions(-)
> 
> One little nit on the submission format - if you include a diffstat, please
> put it after a line consisting only of three - like this:
It was only after creating this that I discovered git-format-patch.
I'll use that in the future (I can assume that it handles stat lines
correctly, right?).
> 
> ---
>  arch/mips/au1000/db1x00/init.c  |    2 +-
>  arch/mips/au1000/mtx-1/init.c   |    2 +-
>  arch/mips/au1000/pb1000/init.c  |    2 +-
> 
> This keeps git and other tools that try to extract the body of the mail
> for the description from considering the diffstat as part of the
> description.
> 
> Patch applied, thanks!
Thanks!  Is there any chance of this making it into 2.6.27?  I saw that
Linus marked the master branch as 2.6.27-rc1 today, so I'm not very
optimistic.  But I have to make some decisions about internal releases
etc and I'm still trying to get a handle on how the kernel gets
versioned. 
> 
>   Ralf
> 
-Kevin

Re: [PATCH v2 1/1][MIPS] Initialization of Alchemy boards

[Ralf Baechle]

On Mon, Jul 28, 2008 at 10:56:04PM -0500, Kevin Hickey wrote:

> > One little nit on the submission format - if you include a diffstat, please
> > put it after a line consisting only of three - like this:
> It was only after creating this that I discovered git-format-patch.
> I'll use that in the future (I can assume that it handles stat lines
> correctly, right?).

Of course.  But it only works if you maintain your patches in git ;-)

> Thanks!  Is there any chance of this making it into 2.6.27?  I saw that
> Linus marked the master branch as 2.6.27-rc1 today, so I'm not very
> optimistic.  But I have to make some decisions about internal releases
> etc and I'm still trying to get a handle on how the kernel gets
> versioned. 

Of course it will; it's a fix after all so not affected at all by the-rc1
deadline.

  Ralf