From: Bob Picco <bob.picco@hp.com>
Date: Mon, 31 Oct 2005 18:25:25 +0000 (-0500)
Subject: [IA64] Recent SPARSEMEM and DISCONTIG changes break some builds
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=631bb0e74e811e0d9ad23e7462a02d4767b4dd9d;p=linux-beck.git

[IA64] Recent SPARSEMEM and DISCONTIG changes break some builds

My only objection to pfn_to_kaddr, which was introduced for HotPlug memory,
is that all arches have an identical implementation. I haven't had a chance
to pursue why yet.  There is probably some arch issue I'm unaware of.

Signed-off-by: Bob Picco <bob.picco@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
---

diff --git a/include/asm-ia64/page.h b/include/asm-ia64/page.h
index ef436b9d06ad..9d41548b7fef 100644
--- a/include/asm-ia64/page.h
+++ b/include/asm-ia64/page.h
@@ -120,6 +120,7 @@ extern unsigned long max_low_pfn;
 
 #define page_to_phys(page)	(page_to_pfn(page) << PAGE_SHIFT)
 #define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
+#define pfn_to_kaddr(pfn)	__va((pfn) << PAGE_SHIFT)
 
 typedef union ia64_va {
 	struct {