[PATCH] powerpc/nohash: Fix build break with 4K pages

Commit 74701d5947a6 "powerpc/mm: Rename function to indicate we are
allocating fragments" renamed page_table_free() to pte_fragment_free().
One occurrence was mistyped as pte_fragment_fre().

This only breaks the nohash 4K page build, which is not the default or
enabled in any defconfig.

Fixes: 74701d5947a6 ("powerpc/mm: Rename function to indicate we are allocating fragments")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
 arch/powerpc/include/asm/nohash/64/pgalloc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/include/asm/nohash/64/pgalloc.h b/arch/powerpc/include/asm/nohash/64/pgalloc.h
index 0c12a3bfe2ab..069369f6414b 100644
--- a/arch/powerpc/include/asm/nohash/64/pgalloc.h
+++ b/arch/powerpc/include/asm/nohash/64/pgalloc.h

@@ -172,7 +172,7 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
 
 static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
 {
-	pte_fragment_fre((unsigned long *)pte, 1);
+	pte_fragment_free((unsigned long *)pte, 1);
 }
 
 static inline void pte_free(struct mm_struct *mm, pgtable_t ptepage)

-- 
2.5.0

Michael Ellerman [off-list ref] writes:

Commit 74701d5947a6 "powerpc/mm: Rename function to indicate we are
allocating fragments" renamed page_table_free() to pte_fragment_free().
One occurrence was mistyped as pte_fragment_fre().

This only breaks the nohash 4K page build, which is not the default or
enabled in any defconfig.

Can you share the .config. I will add it to the build test.

Fixes: 74701d5947a6 ("powerpc/mm: Rename function to indicate we are allocating fragments")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

Reviewed-by: Aneesh Kumar K.V <redacted>

On Wed, 2016-06-08 at 20:19 +0530, Aneesh Kumar K.V wrote:

Michael Ellerman [off-list ref] writes:

quoted

Commit 74701d5947a6 "powerpc/mm: Rename function to indicate we are
allocating fragments" renamed page_table_free() to pte_fragment_free().
One occurrence was mistyped as pte_fragment_fre().

This only breaks the nohash 4K page build, which is not the default or
enabled in any defconfig.

Can you share the .config. I will add it to the build test.

It was a randconfig, it still doesn't build even with this patch:

  http://kisskb.ellerman.id.au/kisskb/buildresult/12705111/

cheers

On Wed, 2016-06-08 at 23:21 +1000, Michael Ellerman wrote:

Commit 74701d5947a6 "powerpc/mm: Rename function to indicate we are
allocating fragments" renamed page_table_free() to pte_fragment_free().
One occurrence was mistyped as pte_fragment_fre().

This only breaks the nohash 4K page build, which is not the default or
enabled in any defconfig.

s/4K/64K/

-Scott

On Thu, 2016-06-09 at 20:53 -0500, Scott Wood wrote:

On Wed, 2016-06-08 at 23:21 +1000, Michael Ellerman wrote:

quoted

Commit 74701d5947a6 "powerpc/mm: Rename function to indicate we are
allocating fragments" renamed page_table_free() to pte_fragment_free().
One occurrence was mistyped as pte_fragment_fre().

This only breaks the nohash 4K page build, which is not the default or
enabled in any defconfig.

s/4K/64K/

Ugh, yep sorry, the ifdef confused me:

  #ifndef CONFIG_PPC_64K_PAGES
  ...
  #else /* if CONFIG_PPC_64K_PAGES */
  ...
  static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
  {
  	pte_fragment_fre((unsigned long *)pte, 1);
  }
  ...
  #endif /* CONFIG_PPC_64K_PAGES */


Will update before committing.

cheers

On Wed, 2016-08-06 at 13:21:11 UTC, Michael Ellerman wrote:

Commit 74701d5947a6 "powerpc/mm: Rename function to indicate we are
allocating fragments" renamed page_table_free() to pte_fragment_free().
One occurrence was mistyped as pte_fragment_fre().

This only breaks the nohash 4K page build, which is not the default or
enabled in any defconfig.

Fixes: 74701d5947a6 ("powerpc/mm: Rename function to indicate we are allocating fragments")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Reviewed-by: Aneesh Kumar K.V <redacted>

Applied to powerpc fixes with fixed changelog.

https://git.kernel.org/powerpc/c/8017ea35d33f9e0950d369773a

cheers