]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc: fix compile fail in hugetlb cmdline parsing
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Mon, 7 May 2012 14:32:22 +0000 (10:32 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 May 2012 23:51:19 +0000 (16:51 -0700)
commit272fdf591a3095b52469a7bc3b45b5101e66e0a8
treee9be95318302fe7143c4050910c91b3379d6b534
parent02a2282040ea02bf912d018a9b77a27613256736
powerpc: fix compile fail in hugetlb cmdline parsing

Commit bc23a2a1a3a9738d935df8d9dde656248866b8dd

    "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>
arch/powerpc/mm/hugetlbpage.c