Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 89528127fa5f4aca0483203c87c945555d057770

Authored by Paul Gortmaker
Committed by Greg Kroah-Hartman
1 parent 9ff1f838e9
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

powerpc: fix compile fail in hugetlb cmdline parsing 

Commit 9fb48c744ba6a4bf58b666f4e6fdac3008ea1bd4

    "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 <rusty@rustcorp.com.au>
Cc: Jim Cromie <jim.cromie@gmail.com>
Cc: Jason Baron <jbaron@redhat.com>
Cc: Becky Bruce <beckyb@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

arch/powerpc/mm/hugetlbpage.c
Diff comments   View file @ 8952812
... ... @@ -271,7 +271,8 @@
271 271  
272 272 unsigned long gpage_npages[MMU_PAGE_COUNT];
273 273  
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)
275 276 {
276 277 static phys_addr_t size;
277 278 unsigned long npages;