Patchwork powerpc/mm: Fix parse_arg build error

login
register
mail settings
Submitter Matthew McClintock
Date Jan. 13, 2012, 5:05 a.m.
Message ID <1326431115-425-1-git-send-email-msm@freescale.com>
Download mbox | patch
Permalink /patch/135715/
State Superseded
Headers show

Comments

Matthew McClintock - Jan. 13, 2012, 5:05 a.m.
This fixes this build issue:

arch/powerpc/mm/hugetlbpage.c: In function 'reserve_hugetlb_gpages':
arch/powerpc/mm/hugetlbpage.c:312:2: error: implicit declaration of function 'parse_args'
make[1]: *** [arch/powerpc/mm/hugetlbpage.o] Error 1

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
This is for benh next tree

 arch/powerpc/mm/hugetlbpage.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Kumar Gala - Jan. 13, 2012, 8:45 p.m.
On Jan 12, 2012, at 11:05 PM, Matthew McClintock wrote:

> This fixes this build issue:
> 
> arch/powerpc/mm/hugetlbpage.c: In function 'reserve_hugetlb_gpages':
> arch/powerpc/mm/hugetlbpage.c:312:2: error: implicit declaration of function 'parse_args'
> make[1]: *** [arch/powerpc/mm/hugetlbpage.o] Error 1
> 
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
> This is for benh next tree
> 
> arch/powerpc/mm/hugetlbpage.c |    1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)

This is fixed upstream, benh's tree is based on a older snapshot of linus's tree that doesn't have this fix.

commit 13020be8be2d5843c3810169cdbcc51f07ff020f
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Thu Nov 24 09:40:07 2011 +0000

    powerpc: Fix compiliation with hugetlbfs enabled

- k
McClintock Matthew-B29882 - Jan. 13, 2012, 8:54 p.m.
On Fri, Jan 13, 2012 at 2:45 PM, Kumar Gala <galak@kernel.crashing.org> wrote:
> On Jan 12, 2012, at 11:05 PM, Matthew McClintock wrote:
>
>> This fixes this build issue:
>>
>> arch/powerpc/mm/hugetlbpage.c: In function 'reserve_hugetlb_gpages':
>> arch/powerpc/mm/hugetlbpage.c:312:2: error: implicit declaration of function 'parse_args'
>> make[1]: *** [arch/powerpc/mm/hugetlbpage.o] Error 1
>>
>> Signed-off-by: Matthew McClintock <msm@freescale.com>
>> ---
>> This is for benh next tree
>>
>> arch/powerpc/mm/hugetlbpage.c |    1 +
>> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> This is fixed upstream, benh's tree is based on a older snapshot of linus's tree that doesn't have this fix.
>
> commit 13020be8be2d5843c3810169cdbcc51f07ff020f
> Author: Kumar Gala <galak@kernel.crashing.org>
> Date:   Thu Nov 24 09:40:07 2011 +0000
>
>    powerpc: Fix compiliation with hugetlbfs enabled

I was starting to realize this today after I saw Ben's pull request...

-M

Patch

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>