[PATCH] ARM: Fix compile after delay page freeing patch

[PATCH] ARM: Fix compile after delay page freeing patch

[Tony Lindgren]

Commit 06824ba824b3e9f2fedb38bee79af0643198ed7f
(ARM: tlb: delay page freeing for SMP and ARMv7 CPUs) causes
the following compile error for at least omap1_defconfig:

In file included from arch/arm/mm/init.c:27:
arch/arm/include/asm/tlb.h: In function 'tlb_flush_mmu':
arch/arm/include/asm/tlb.h:101: error: implicit declaration of function 'release_pages'
arch/arm/include/asm/tlb.h: In function 'tlb_remove_page':
arch/arm/include/asm/tlb.h:165: error: implicit declaration of function 'page_cache_release'

Fix this by including pagemap.h.

Signed-off-by: Tony Lindgren <tony@atomide.com>

--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -19,6 +19,7 @@
 #include <linux/gfp.h>
 #include <linux/memblock.h>
 #include <linux/sort.h>
+#include <linux/pagemap.h>
 
 #include <asm/mach-types.h>
 #include <asm/sections.h>

[PATCH] ARM: Fix compile after delay page freeing patch

[Sergei Shtylyov]

Hello.

Tony Lindgren wrote:

> Commit 06824ba824b3e9f2fedb38bee79af0643198ed7f
> (ARM: tlb: delay page freeing for SMP and ARMv7 CPUs) causes
> the following compile error for at least omap1_defconfig:

> In file included from arch/arm/mm/init.c:27:
> arch/arm/include/asm/tlb.h: In function 'tlb_flush_mmu':
> arch/arm/include/asm/tlb.h:101: error: implicit declaration of function 'release_pages'
> arch/arm/include/asm/tlb.h: In function 'tlb_remove_page':
> arch/arm/include/asm/tlb.h:165: error: implicit declaration of function 'page_cache_release'
> 
> Fix this by including pagemap.h.
> 
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> 
> --- a/arch/arm/mm/init.c
> +++ b/arch/arm/mm/init.c
> @@ -19,6 +19,7 @@
>  #include <linux/gfp.h>
>  #include <linux/memblock.h>
>  #include <linux/sort.h>
> +#include <linux/pagemap.h>
>  
>  #include <asm/mach-types.h>
>  #include <asm/sections.h>

    Shouldn't you be #including it into tlb.h instead?

WBR, Sergei

[PATCH] ARM: Fix compile after delay page freeing patch

[Tony Lindgren]

* Sergei Shtylyov <sshtylyov@mvista.com> [110222 11:51]:
> Hello.
> 
> Tony Lindgren wrote:
> 
> >Commit 06824ba824b3e9f2fedb38bee79af0643198ed7f
> >(ARM: tlb: delay page freeing for SMP and ARMv7 CPUs) causes
> >the following compile error for at least omap1_defconfig:
> 
> >In file included from arch/arm/mm/init.c:27:
> >arch/arm/include/asm/tlb.h: In function 'tlb_flush_mmu':
> >arch/arm/include/asm/tlb.h:101: error: implicit declaration of function 'release_pages'
> >arch/arm/include/asm/tlb.h: In function 'tlb_remove_page':
> >arch/arm/include/asm/tlb.h:165: error: implicit declaration of function 'page_cache_release'
> >
> >Fix this by including pagemap.h.
> >
> >Signed-off-by: Tony Lindgren <tony@atomide.com>
> >
> >--- a/arch/arm/mm/init.c
> >+++ b/arch/arm/mm/init.c
> >@@ -19,6 +19,7 @@
> > #include <linux/gfp.h>
> > #include <linux/memblock.h>
> > #include <linux/sort.h>
> >+#include <linux/pagemap.h>
> > #include <asm/mach-types.h>
> > #include <asm/sections.h>
> 
>    Shouldn't you be #including it into tlb.h instead?

Hmm, pagemap.h actually seems to be there in tlb.h,
but in #ifndef CONFIG_MMU.

Tony

[PATCH] ARM: Fix compile after delay page freeing patch

[Uwe Kleine-König]

On Tue, Feb 22, 2011 at 10:51:53PM +0300, Sergei Shtylyov wrote:
> Hello.
> 
> Tony Lindgren wrote:
> 
> >Commit 06824ba824b3e9f2fedb38bee79af0643198ed7f
> >(ARM: tlb: delay page freeing for SMP and ARMv7 CPUs) causes
> >the following compile error for at least omap1_defconfig:
I't not omap1_defconfig only, see

	http://armlinux.simtec.co.uk/kautobuild/2.6.38-rc5-git6/index.html
 
> >In file included from arch/arm/mm/init.c:27:
> >arch/arm/include/asm/tlb.h: In function 'tlb_flush_mmu':
> >arch/arm/include/asm/tlb.h:101: error: implicit declaration of function 'release_pages'
> >arch/arm/include/asm/tlb.h: In function 'tlb_remove_page':
> >arch/arm/include/asm/tlb.h:165: error: implicit declaration of function 'page_cache_release'
> >
> >Fix this by including pagemap.h.
> >
> >Signed-off-by: Tony Lindgren <tony@atomide.com>
> >
> >--- a/arch/arm/mm/init.c
> >+++ b/arch/arm/mm/init.c
> >@@ -19,6 +19,7 @@
> > #include <linux/gfp.h>
> > #include <linux/memblock.h>
> > #include <linux/sort.h>
> >+#include <linux/pagemap.h>
> > #include <asm/mach-types.h>
> > #include <asm/sections.h>
> 
>    Shouldn't you be #including it into tlb.h instead?
For me building arch/arm/mm/mmu.o fails, too.  So Tony's patch doesn't
help.

Adding the #include to arch/arm/include/asm/tlb.h works fine though.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[PATCH] ARM: Fix compile after delay page freeing patch

[Russell King - ARM Linux]

On Tue, Feb 22, 2011 at 11:43:32AM -0800, Tony Lindgren wrote:
> Commit 06824ba824b3e9f2fedb38bee79af0643198ed7f
> (ARM: tlb: delay page freeing for SMP and ARMv7 CPUs) causes
> the following compile error for at least omap1_defconfig:
> 
> In file included from arch/arm/mm/init.c:27:
> arch/arm/include/asm/tlb.h: In function 'tlb_flush_mmu':
> arch/arm/include/asm/tlb.h:101: error: implicit declaration of function 'release_pages'
> arch/arm/include/asm/tlb.h: In function 'tlb_remove_page':
> arch/arm/include/asm/tlb.h:165: error: implicit declaration of function 'page_cache_release'

Grant already mentioned this to me this evening.

This happens if you build with CONFIG_SWAP=n, and is something that the
asm-generic/tlb.h also appears to suffer from.  Why no one else has
noticed this I've no idea.

Note that linux/swap.h has this comment:

/* only sparc can not include linux/pagemap.h in this file
 * so leave page_cache_release and release_pages undeclared... */
#define free_page_and_swap_cache(page) \
        page_cache_release(page)
#define free_pages_and_swap_cache(pages, nr) \
        release_pages((pages), (nr), 0);

which is rather annoying, because it makes the build error dependent on
the configuration.

So, we should add linux/pagemap.h to both asm-generic/tlb.h and the ARM
tlb.h as they both should suffer the same problem.

Note that arch/x86/mm/init.c and arch/x86/mm/pgtable.c both include
asm/tlb.h without linux/pagemap.h, and use the generic version.  I bet
no one's tried building x86 with CONFIG_SWAP=n yet...

[PATCH] ARM: Fix compile after delay page freeing patch

[Uwe Kleine-König]

Hello Russell,

On Tue, Feb 22, 2011 at 07:59:29PM +0000, Russell King - ARM Linux wrote:
> Note that arch/x86/mm/init.c and arch/x86/mm/pgtable.c both include
> asm/tlb.h without linux/pagemap.h, and use the generic version.  I bet
> no one's tried building x86 with CONFIG_SWAP=n yet...
I did, and it doesn't fail.

include/asm-generic/tlb.h includes <asm/pgalloc.h> which for x86
includes <linux/pagemap.h>

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[PATCH] ARM: Fix compile after delay page freeing patch

[Russell King - ARM Linux]

On Tue, Feb 22, 2011 at 09:10:47PM +0100, Uwe Kleine-K?nig wrote:
> Hello Russell,
> 
> On Tue, Feb 22, 2011 at 07:59:29PM +0000, Russell King - ARM Linux wrote:
> > Note that arch/x86/mm/init.c and arch/x86/mm/pgtable.c both include
> > asm/tlb.h without linux/pagemap.h, and use the generic version.  I bet
> > no one's tried building x86 with CONFIG_SWAP=n yet...
> I did, and it doesn't fail.
> 
> include/asm-generic/tlb.h includes <asm/pgalloc.h> which for x86
> includes <linux/pagemap.h>

Maybe then we should add linux/pagemap.h to our asm/pgalloc.h.

[PATCH] ARM: fix build failure

[Uwe Kleine-König]

Commit

	06824ba (ARM: tlb: delay page freeing for SMP and ARMv7 CPUs)

introduced a build failure for builds with CONFIG_SWAP=n:

	In file included from arch/arm/mm/init.c:27:
	arch/arm/include/asm/tlb.h: In function 'tlb_flush_mmu':
	arch/arm/include/asm/tlb.h:101: error: implicit declaration of function 'release_pages'
	arch/arm/include/asm/tlb.h: In function 'tlb_remove_page':
	arch/arm/include/asm/tlb.h:165: error: implicit declaration of function 'page_cache_release'

Fix that by #including <linux/pagemap.h> in <asm/pgalloc.h> as it's done
by x86.

Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
 arch/arm/include/asm/pgalloc.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
index 9763be0..22de005 100644
--- a/arch/arm/include/asm/pgalloc.h
+++ b/arch/arm/include/asm/pgalloc.h
@@ -10,6 +10,8 @@
 #ifndef _ASMARM_PGALLOC_H
 #define _ASMARM_PGALLOC_H
 
+#include <linux/pagemap.h>
+
 #include <asm/domain.h>
 #include <asm/pgtable-hwdef.h>
 #include <asm/processor.h>
-- 
1.7.2.3

[PATCH] ARM: fix build failure

[Tony Lindgren]

* Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> [110222 12:25]:
> Commit
> 
> 	06824ba (ARM: tlb: delay page freeing for SMP and ARMv7 CPUs)
> 
> introduced a build failure for builds with CONFIG_SWAP=n:
> 
> 	In file included from arch/arm/mm/init.c:27:
> 	arch/arm/include/asm/tlb.h: In function 'tlb_flush_mmu':
> 	arch/arm/include/asm/tlb.h:101: error: implicit declaration of function 'release_pages'
> 	arch/arm/include/asm/tlb.h: In function 'tlb_remove_page':
> 	arch/arm/include/asm/tlb.h:165: error: implicit declaration of function 'page_cache_release'
> 
> Fix that by #including <linux/pagemap.h> in <asm/pgalloc.h> as it's done
> by x86.
> 
> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>

Acked-by: Tony Lindgren <tony@atomide.com>

[PATCH] ARM: fix build failure

[Russell King - ARM Linux]

Looks good.  Can you stick it in the patch system please?

On Tue, Feb 22, 2011 at 09:26:42PM +0100, Uwe Kleine-K?nig wrote:
> Commit
> 
> 	06824ba (ARM: tlb: delay page freeing for SMP and ARMv7 CPUs)
> 
> introduced a build failure for builds with CONFIG_SWAP=n:
> 
> 	In file included from arch/arm/mm/init.c:27:
> 	arch/arm/include/asm/tlb.h: In function 'tlb_flush_mmu':
> 	arch/arm/include/asm/tlb.h:101: error: implicit declaration of function 'release_pages'
> 	arch/arm/include/asm/tlb.h: In function 'tlb_remove_page':
> 	arch/arm/include/asm/tlb.h:165: error: implicit declaration of function 'page_cache_release'
> 
> Fix that by #including <linux/pagemap.h> in <asm/pgalloc.h> as it's done
> by x86.
> 
> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> ---
>  arch/arm/include/asm/pgalloc.h |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
> index 9763be0..22de005 100644
> --- a/arch/arm/include/asm/pgalloc.h
> +++ b/arch/arm/include/asm/pgalloc.h
> @@ -10,6 +10,8 @@
>  #ifndef _ASMARM_PGALLOC_H
>  #define _ASMARM_PGALLOC_H
>  
> +#include <linux/pagemap.h>
> +
>  #include <asm/domain.h>
>  #include <asm/pgtable-hwdef.h>
>  #include <asm/processor.h>
> -- 
> 1.7.2.3
> 

[PATCH] ARM: fix build failure

[Uwe Kleine-König]

On Tue, Feb 22, 2011 at 10:26:28PM +0000, Russell King - ARM Linux wrote:
> Looks good.  Can you stick it in the patch system please?
done as

	http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=6757/1

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[PATCH] ARM: Fix compile after delay page freeing patch

[Tony Lindgren]

* Russell King - ARM Linux <linux@arm.linux.org.uk> [110222 11:57]:
> On Tue, Feb 22, 2011 at 11:43:32AM -0800, Tony Lindgren wrote:
> > Commit 06824ba824b3e9f2fedb38bee79af0643198ed7f
> > (ARM: tlb: delay page freeing for SMP and ARMv7 CPUs) causes
> > the following compile error for at least omap1_defconfig:
> > 
> > In file included from arch/arm/mm/init.c:27:
> > arch/arm/include/asm/tlb.h: In function 'tlb_flush_mmu':
> > arch/arm/include/asm/tlb.h:101: error: implicit declaration of function 'release_pages'
> > arch/arm/include/asm/tlb.h: In function 'tlb_remove_page':
> > arch/arm/include/asm/tlb.h:165: error: implicit declaration of function 'page_cache_release'
> 
> Grant already mentioned this to me this evening.
> 
> This happens if you build with CONFIG_SWAP=n, and is something that the
> asm-generic/tlb.h also appears to suffer from.  Why no one else has
> noticed this I've no idea.
> 
> Note that linux/swap.h has this comment:
> 
> /* only sparc can not include linux/pagemap.h in this file
>  * so leave page_cache_release and release_pages undeclared... */
> #define free_page_and_swap_cache(page) \
>         page_cache_release(page)
> #define free_pages_and_swap_cache(pages, nr) \
>         release_pages((pages), (nr), 0);
> 
> which is rather annoying, because it makes the build error dependent on
> the configuration.
> 
> So, we should add linux/pagemap.h to both asm-generic/tlb.h and the ARM
> tlb.h as they both should suffer the same problem.
> 
> Note that arch/x86/mm/init.c and arch/x86/mm/pgtable.c both include
> asm/tlb.h without linux/pagemap.h, and use the generic version.  I bet
> no one's tried building x86 with CONFIG_SWAP=n yet...

Looks like it's in arch/x86/mm/init_[32|64].c and pgtable[32|64].c
though. So maybe we just need to patch either ARM tlb.h. Or patch
the necessary .c files to include pagemap.h.

Regards,

Tony