[RFC][PATCH] unify pfn_to_page [25/25] sparc64 pfn_to_page/page_to_pfn

[RFC][PATCH] unify pfn_to_page [25/25] sparc64 pfn_to_page/page_to_pfn

[KAMEZAWA Hiroyuki]

sparc64 can use generic ones by defining ARCH_PFN_OFFSET as pfn_base.

Signed-Off-By: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitu.com>

Index: cleanup_pfn_page/include/asm-sparc64/page.h
===================================================================
--- cleanup_pfn_page.orig/include/asm-sparc64/page.h
+++ cleanup_pfn_page/include/asm-sparc64/page.h
@@ -129,8 +129,7 @@ typedef unsigned long pgprot_t;
   * the first physical page in the machine is at some huge physical address,
   * such as 4GB.   This is common on a partitioned E10000, for example.
   */
-extern struct page *pfn_to_page(unsigned long pfn);
-extern unsigned long page_to_pfn(struct page *);
+#define ARCH_PFN_OFFSET		(pfn_base)

  #define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr)>>PAGE_SHIFT)

Index: cleanup_pfn_page/arch/sparc64/mm/init.c
===================================================================
--- cleanup_pfn_page.orig/arch/sparc64/mm/init.c
+++ cleanup_pfn_page/arch/sparc64/mm/init.c
@@ -320,16 +320,6 @@ void __kprobes flush_icache_range(unsign
  	}
  }

-unsigned long page_to_pfn(struct page *page)
-{
-	return (unsigned long) ((page - mem_map) + pfn_base);
-}
-
-struct page *pfn_to_page(unsigned long pfn)
-{
-	return (mem_map + (pfn - pfn_base));
-}
-
  void show_mem(void)
  {
  	printk("Mem-info:\n");

Re: [RFC][PATCH] unify pfn_to_page [25/25] sparc64 pfn_to_page/page_to_pfn

[David S. Miller]

From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Mon, 06 Feb 2006 20:23:33 +0900

> --- cleanup_pfn_page.orig/arch/sparc64/mm/init.c
> +++ cleanup_pfn_page/arch/sparc64/mm/init.c
> @@ -320,16 +320,6 @@ void __kprobes flush_icache_range(unsign
>   	}
>   }
> 
> -unsigned long page_to_pfn(struct page *page)
> -{
> -	return (unsigned long) ((page - mem_map) + pfn_base);
> -}
> -
> -struct page *pfn_to_page(unsigned long pfn)
> -{
> -	return (mem_map + (pfn - pfn_base));
> -}
> -
>   void show_mem(void)
>   {
>   	printk("Mem-info:\n");

We did not want these inlined on sparc64 for a good reason.
The pointer arithmatic gets expanded to many additions,
subtractions, and shifts, and I felt it too much to inline.

If you want to consolidate all of the implementations, that's
fine, but please keep the option of not inlining these two
routines.

Thank you.

Re: [RFC][PATCH] unify pfn_to_page [25/25] sparc64 pfn_to_page/page_to_pfn

[KAMEZAWA Hiroyuki]

David S. Miller wrote:
> We did not want these inlined on sparc64 for a good reason.
> The pointer arithmatic gets expanded to many additions,
> subtractions, and shifts, and I felt it too much to inline.
> 
Okay.
> If you want to consolidate all of the implementations, that's
> fine, but please keep the option of not inlining these two
> routines.
> 

I'll do (and CC to each arch's maintainer in next post)

Thanks,
-- Kame