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

PATCH New Michael Neuling 6 participants 11 messages Feb 15, 2012 – Feb 20, 2012

Subsystems (2)

PowerPC Linux-next tree

lore

Share & tools

lore

Michael Neuling

author

2012-02-15 23:08 UTC #0 lore raw

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

Matthew McClintock

2012-02-15 23:28 UTC #1 lore raw

PATCH 1/1 powerpc/hugepage: Fix missing header file for parse_args

This seems to fix the following issue:

Signed-off-by Matthew McClintock <[email protected]>

---
 arch/powerpc/mm/hugetlbpage.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

arch/powerpc/mm/hugetlbpage.c +1 -0

index 79c575d..a8b3cc7 100644
@@ -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>

Signature · 1 line

1.7.6.1

McClintock Matthew-B29882

2012-02-15 23:32 UTC #2 lore raw

In reply to Michael Neuling

Quoted 9 lines · Michael Neuling

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'

A suggest fix has been submitted.

-M

Michael Neuling

author

2012-02-15 23:37 UTC #3 lore raw

Quoted 7 lines

Quoted 7 lines
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=

Quoted 7 lines

gs' makes integer from pointer without a cast
Quoted 1 line
include/linux/moduleparam.h:317: note: expected 's16' but argument is of =
type 'int (*)(char *, char *)'
Quoted 1 line
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

McClintock Matthew-B29882

2012-02-15 23:40 UTC #4 lore raw

Quoted 8 lines · Michael Neuling

Quoted 8 lines
Quoted 7 lines
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 8 lines

Quoted 6 lines
Quoted 1 line
include/linux/moduleparam.h:317: note: expected 's16' but argument is of =
type 'int (*)(char *, char *)'
Quoted 1 line
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?

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

Michael Neuling

author

2012-02-16 05:01 UTC #5 lore raw

In message <CAEsOVNfOcH+oaxSqw6Cy1suY_9zVDOhQe+v_e-zTwc0M5Q_Wgg@mail.gmail.com>

Quoted 17 lines · you

Quoted 7 lines · Michael Neuling
Quoted 7 lines
Quoted 7 lines
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 2 lines
Quoted 2 lines
gs' makes integer from pointer without a cast
Quoted 1 line
include/linux/moduleparam.h:317: note: expected 's16' but argument is =
of =3D
Quoted 2 lines
Quoted 2 lines
type 'int (*)(char *, char *)'
Quoted 1 line
arch/powerpc/mm/hugetlbpage.c:313: error: too few arguments to functio=
n '=3D
Quoted 2 lines
Quoted 2 lines
parse_args'

Quoted 8 lines

Quoted 3 lines
Quoted 1 line
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

McClintock Matthew-B29882

2012-02-16 05:03 UTC #6 lore raw

Quoted 24 lines · On Feb 15, 2012 9:01 PM, "Michael Neuling"…

In message <CAEsOVNfOcH+oaxSqw6Cy1suY_9zVDOhQe+v_e-zTwc0M5Q_Wgg@mail.gmail.com<mailto:CAEsOVNfOcH%2BoaxSqw6Cy1suY_9zVDOhQe%[email protected]>>
Quoted 21 lines · you
Quoted 7 lines · On Wed, Feb 15, 2012 at 11:37 PM, Michael Neuling…
Quoted 7 lines
Quoted 7 lines
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 2 lines
Quoted 2 lines
gs' makes integer from pointer without a cast
Quoted 1 line
include/linux/moduleparam.h:317: note: expected 's16' but argument is =
of =3D
Quoted 2 lines
Quoted 2 lines
type 'int (*)(char *, char *)'
Quoted 1 line
arch/powerpc/mm/hugetlbpage.c:313: error: too few arguments to functio=
n '=3D
Quoted 5 lines
Quoted 3 lines
parse_args'
A suggest fix has been submitted.
Do you have a link? =A0Which tree is it going in?

Quoted 9 lines

Quoted 4 lines
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

Quoted 5 lines

Mikey
_______________________________________________
Linuxppc-dev mailing list [email protected]<mailto:[email protected]>
https://lists.ozlabs.org/listinfo/linuxppc-dev

_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev

Stephen Rothwell

2012-02-16 00:15 UTC #7 lore raw

In reply to Michael Neuling

Hi Rusty,

Quoted 8 lines · On Thu, 16 Feb 2012 10:08:41 +1100 Michael Neuling <[email protected]> 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)

Signature · 2 lines

Cheers,
Stephen Rothwell                    [email protected]

Stephen Rothwell

2012-02-16 02:14 UTC #8 lore raw

Hi Rusty,

Quoted 4 lines · On Thu, 16 Feb 2012 11:15:13 +1100 Stephen Rothwell <[email protected]>…

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.

Signature · 3 lines

Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/

Pawel Moll

2012-02-17 16:09 UTC #9 lore raw

PATCH 1/1 params: Fix parse_args() use in PowerPC's reserve_hugetlb_gpages()

In reply to Stephen Rothwell

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 <[email protected]>

---
 arch/powerpc/mm/hugetlbpage.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

arch/powerpc/mm/hugetlbpage.c +2 -1

index 57c7465..a3e6287 100644
@@ -310,7 +310,8 @@ void __init reserve_hugetlb_gpages(void)
 	int i;
 
 	strlcpy(cmdline, boot_command_line, COMMAND_LINE_SIZE);
-	parse_args("hugetlb gpages", cmdline, NULL, 0, &do_gpage_early_setup);
+	parse_args("hugetlb gpages", cmdline, NULL, 0, 0, 0,
+			&do_gpage_early_setup);
 
 	/*
 	 * Walk gpage list in reverse, allocating larger page sizes first.

Signature · 1 line

1.7.5.4

Rusty Russell

Applied

2012-02-20 01:26 UTC #10 lore raw

Re: [PATCH] params: Fix parse_args() use in PowerPC's reserve_hugetlb_gpages()

Quoted 4 lines · Pawel Moll

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 <[email protected]>

Thanks Stephen, Pawel.

Applied,
Rusty.