Build fail in hugetlbpage.c with linux-next and mpc85xx_defconfig

Becky,

This has been broken in linux-next for a while.  Looks like a merge
issue but you were the last to touch it...

arch/powerpc/mm/hugetlbpage.c: In function 'reserve_hugetlb_gpages':
arch/powerpc/mm/hugetlbpage.c:313: error: passing argument 5 of 'parse_args' makes integer from pointer without a cast
include/linux/moduleparam.h:317: note: expected 's16' but argument is of type 'int (*)(char *, char *)'
arch/powerpc/mm/hugetlbpage.c:313: error: too few arguments to function 'parse_args'

Mikey

This seems to fix the following issue:

arch/powerpc/mm/hugetlbpage.c: In function 'reserve_hugetlb_gpages':
arch/powerpc/mm/hugetlbpage.c:313: error: passing argument 5 of 'parse_args' makes integer from pointer without a cast
include/linux/moduleparam.h:317: note: expected 's16' but argument is of type 'int (*)(char *, char *)'
arch/powerpc/mm/hugetlbpage.c:313: error: too few arguments to function 'parse_args'

Signed-off-by: Matthew McClintock <redacted>
---
 arch/powerpc/mm/hugetlbpage.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 79c575d..a8b3cc7 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c

@@ -15,6 +15,7 @@
 #include <linux/of_fdt.h>
 #include <linux/memblock.h>
 #include <linux/bootmem.h>
+#include <linux/moduleparam.h>
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
 #include <asm/tlb.h>

-- 
1.7.6.1

On Wed, Feb 15, 2012 at 11:08 PM, Michael Neuling [off-list ref] wrote=
:

Becky,

This has been broken in linux-next for a while. =A0Looks like a merge
issue but you were the last to touch it...

arch/powerpc/mm/hugetlbpage.c: In function 'reserve_hugetlb_gpages':
arch/powerpc/mm/hugetlbpage.c:313: error: passing argument 5 of 'parse_ar=

gs' makes integer from pointer without a cast

include/linux/moduleparam.h:317: note: expected 's16' but argument is of =

type 'int (*)(char *, char *)'

arch/powerpc/mm/hugetlbpage.c:313: error: too few arguments to function '=

parse_args'

A suggest fix has been submitted.

-M=

quoted

Becky,

This has been broken in linux-next for a while. =A0Looks like a merge
issue but you were the last to touch it...

arch/powerpc/mm/hugetlbpage.c: In function 'reserve_hugetlb_gpages':
arch/powerpc/mm/hugetlbpage.c:313: error: passing argument 5 of 'parse_ar=

gs' makes integer from pointer without a cast

quoted

include/linux/moduleparam.h:317: note: expected 's16' but argument is of =

type 'int (*)(char *, char *)'

quoted

arch/powerpc/mm/hugetlbpage.c:313: error: too few arguments to function '=

parse_args'

A suggest fix has been submitted.

Do you have a link?  Which tree is it going in?

Mikey

On Wed, Feb 15, 2012 at 11:37 PM, Michael Neuling [off-list ref] wrote=
:

quoted

quoted

Becky,

This has been broken in linux-next for a while. =3DA0Looks like a merg=

e

quoted

quoted

issue but you were the last to touch it...

arch/powerpc/mm/hugetlbpage.c: In function 'reserve_hugetlb_gpages':
arch/powerpc/mm/hugetlbpage.c:313: error: passing argument 5 of 'parse=

_ar=3D

quoted

gs' makes integer from pointer without a cast

quoted

include/linux/moduleparam.h:317: note: expected 's16' but argument is =

of =3D

quoted

type 'int (*)(char *, char *)'

quoted

arch/powerpc/mm/hugetlbpage.c:313: error: too few arguments to functio=

n '=3D

quoted

parse_args'

A suggest fix has been submitted.

Do you have a link? =A0Which tree is it going in?

http://lists.ozlabs.org/pipermail/linuxppc-dev/2012-February/095903.html

I just sent it. I'm not sure who would pick this up. Ideally it would
go in the next release.

-M=

Hi Rusty,

On Thu, 16 Feb 2012 10:08:41 +1100 Michael Neuling [off-list ref] wrote:

This has been broken in linux-next for a while.  Looks like a merge
issue but you were the last to touch it...

arch/powerpc/mm/hugetlbpage.c: In function 'reserve_hugetlb_gpages':
arch/powerpc/mm/hugetlbpage.c:313: error: passing argument 5 of 'parse_args' makes integer from pointer without a cast
include/linux/moduleparam.h:317: note: expected 's16' but argument is of type 'int (*)(char *, char *)'
arch/powerpc/mm/hugetlbpage.c:313: error: too few arguments to function 'parse_args'

This was broken by commit b8076966e8e1 ("params: <level>_initcall-like
kernel parameters") from the rr tree which changed the parse_args() API without fixing all
the callers ....

Please add a fix ...

Grep is your friend:

$ git grep -l '\<parse_args(' v3.3-rc1 
v3.3-rc1:Documentation/target/tcm_mod_builder.py
v3.3-rc1:arch/powerpc/mm/hugetlbpage.c
v3.3-rc1:arch/x86/tools/insn_sanity.c
v3.3-rc1:arch/x86/tools/test_get_len.c
v3.3-rc1:include/linux/moduleparam.h
v3.3-rc1:init/main.c
v3.3-rc1:kernel/module.c
v3.3-rc1:kernel/params.c

(The Documentation and x86 ones are a false positives, the powerpc one is real)
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Hi Rusty,

On Thu, 16 Feb 2012 11:15:13 +1100 Stephen Rothwell [off-list ref] wrote:

This was broken by commit b8076966e8e1 ("params: <level>_initcall-like
kernel parameters") from the rr tree which changed the parse_args() API without fixing all
the callers ....

I have reverted the above commit (and the following fix one) for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

In message [off-list ref]
 you wrote:

On Wed, Feb 15, 2012 at 11:37 PM, Michael Neuling [off-list ref] wrote:

quoted

quoted

quoted

Becky,

This has been broken in linux-next for a while. =3DA0Looks like a merge
issue but you were the last to touch it...

arch/powerpc/mm/hugetlbpage.c: In function 'reserve_hugetlb_gpages':
arch/powerpc/mm/hugetlbpage.c:313: error: passing argument 5 of 'parse=

_ar=3D

quoted

quoted

gs' makes integer from pointer without a cast

quoted

include/linux/moduleparam.h:317: note: expected 's16' but argument is =

of =3D

quoted

quoted

type 'int (*)(char *, char *)'

quoted

arch/powerpc/mm/hugetlbpage.c:313: error: too few arguments to functio=

n '=3D

quoted

quoted

parse_args'

A suggest fix has been submitted.

Do you have a link? =A0Which tree is it going in?

http://lists.ozlabs.org/pipermail/linuxppc-dev/2012-February/095903.html

I just sent it. I'm not sure who would pick this up. Ideally it would
go in the next release.

I think that's a different problem, as that's already in next.

sfr posted where problem patch is

Mikey

On Feb 15, 2012 9:01 PM, "Michael Neuling" <mikey@neuling.org<mailto:mikey@neuling.org>> wrote:

In message <CAEsOVNfOcH+oaxSqw6Cy1suY_9zVDOhQe+v_e-zTwc0M5Q_Wgg@mail.gmail.com<mailto:CAEsOVNfOcH%2BoaxSqw6Cy1suY_9zVDOhQe%2Bv_e-zTwc0M5Q_Wgg@mail.gmail.com>>
 you wrote:

quoted

On Wed, Feb 15, 2012 at 11:37 PM, Michael Neuling <mikey@neuling.org<mailto:mikey@neuling.org>> wrote:

quoted

quoted

quoted

Becky,

This has been broken in linux-next for a while. =3DA0Looks like a merge
issue but you were the last to touch it...

arch/powerpc/mm/hugetlbpage.c: In function 'reserve_hugetlb_gpages':
arch/powerpc/mm/hugetlbpage.c:313: error: passing argument 5 of 'parse=

_ar=3D

quoted

quoted

gs' makes integer from pointer without a cast

quoted

include/linux/moduleparam.h:317: note: expected 's16' but argument is =

of =3D

quoted

quoted

type 'int (*)(char *, char *)'

quoted

arch/powerpc/mm/hugetlbpage.c:313: error: too few arguments to functio=

n '=3D

quoted

quoted

parse_args'

A suggest fix has been submitted.

Do you have a link? =A0Which tree is it going in?

http://lists.ozlabs.org/pipermail/linuxppc-dev/2012-February/095903.html

I just sent it. I'm not sure who would pick this up. Ideally it would
go in the next release.

I think that's a different problem, as that's already in next.

sfr posted where problem patch is

Ah got it. Thanks.

-M

Mikey
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org<mailto:Linuxppc-dev@lists.ozlabs.org>
https://lists.ozlabs.org/listinfo/linuxppc-dev

Commit b8076966e8e1 ("params: <level>_initcall-like kernel parameters")
changed the parse_args() API without fixing all the callers. Done now.

Signed-off-by: Pawel Moll <redacted>
---
 arch/powerpc/mm/hugetlbpage.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 57c7465..a3e6287 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c

@@ -310,7 +310,8 @@ void __init reserve_hugetlb_gpages(void)
 =09int i;

=20
 =09strlcpy(cmdline, boot_command_line, COMMAND_LINE_SIZE);
-=09parse_args("hugetlb gpages", cmdline, NULL, 0, &do_gpage_early_setup);
+=09parse_args("hugetlb gpages", cmdline, NULL, 0, 0, 0,
+=09=09=09&do_gpage_early_setup);
=20
 =09/*
 =09 * Walk gpage list in reverse, allocating larger page sizes first.
--=20
1.7.5.4

On Fri, 17 Feb 2012 16:08:36 +0000, Pawel Moll [off-list ref] wrote:

Commit b8076966e8e1 ("params: <level>_initcall-like kernel parameters")
changed the parse_args() API without fixing all the callers. Done now.

Signed-off-by: Pawel Moll <redacted>

Thanks Stephen, Pawel.

Applied,
Rusty.