Skip to content

Commit 8952812

Browse files
Paul Gortmakergregkh
authored andcommitted
powerpc: fix compile fail in hugetlb cmdline parsing
Commit 9fb48c7 "params: add 3rd arg to option handler callback signature" added an extra arg to the function, but didn't catch all the use cases needing it, causing this compile fail in mpc85xx_defconfig: arch/powerpc/mm/hugetlbpage.c:316:4: error: passing argument 7 of 'parse_args' from incompatible pointer type [-Werror] include/linux/moduleparam.h:317:12: note: expected 'int (*)(char *, char *, const char *)' but argument is of type 'int (*)(char *, char *)' This function has no need to printk out the "doing" value, so just add the arg as an "unused". Cc: Rusty Russell <[email protected]> Cc: Jim Cromie <[email protected]> Cc: Jason Baron <[email protected]> Cc: Becky Bruce <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Paul Gortmaker <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 9ff1f83 commit 8952812

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/powerpc/mm/hugetlbpage.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,8 @@ int alloc_bootmem_huge_page(struct hstate *hstate)
271271

272272
unsigned long gpage_npages[MMU_PAGE_COUNT];
273273

274-
static int __init do_gpage_early_setup(char *param, char *val)
274+
static int __init do_gpage_early_setup(char *param, char *val,
275+
const char *unused)
275276
{
276277
static phys_addr_t size;
277278
unsigned long npages;

0 commit comments

Comments
 (0)