[IA64] clean up of xenpage.h
remove nasty undefs in xenpage.h.
Signed-off-by: Isaku Yamahata <[EMAIL PROTECTED]>
diff -r 07558e1876e4 xen/include/asm-ia64/linux-xen/asm/page.h
--- a/xen/include/asm-ia64/linux-xen/asm/page.h Fri Oct 17 18:16:05 2008 +0900
+++ b/xen/include/asm-ia64/linux-xen/asm/page.h Fri Oct 17 18:24:57 2008 +0900
@@ -99,6 +99,7 @@
#define virt_addr_valid(kaddr) mfn_valid(__pa(kaddr) >> PAGE_SHIFT)
+#ifndef XEN
#ifdef CONFIG_VIRTUAL_MEM_MAP
extern int ia64_mfn_valid (unsigned long pfn);
#else
@@ -119,6 +120,7 @@
#define page_to_maddr(page) (page_to_mfn(page) << PAGE_SHIFT)
#define virt_to_page(kaddr) mfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
+#endif
typedef union ia64_va {
struct {
diff -r 07558e1876e4 xen/include/asm-ia64/xenpage.h
--- a/xen/include/asm-ia64/xenpage.h Fri Oct 17 18:16:05 2008 +0900
+++ b/xen/include/asm-ia64/xenpage.h Fri Oct 17 18:24:57 2008 +0900
@@ -5,11 +5,7 @@
#define IA64_MAX_PHYS_BITS 50 /* max. number of physical address bits
(architected) */
#ifndef __ASSEMBLY__
-#undef mfn_valid
-#undef page_to_mfn
-#undef mfn_to_page
#ifdef CONFIG_VIRTUAL_FRAME_TABLE
-#undef ia64_mfn_valid
extern int ia64_mfn_valid (unsigned long pfn);
# define mfn_valid(_pfn) (((_pfn) < max_page) && ia64_mfn_valid(_pfn))
#else
@@ -37,8 +33,6 @@
#define virt_to_maddr(va) (__virt_to_maddr((unsigned long)va))
-#undef page_to_maddr
-#undef virt_to_page
#define page_to_maddr(page) (page_to_mfn(page) << PAGE_SHIFT)
#define virt_to_page(kaddr) (mfn_to_page(virt_to_maddr(kaddr) >>
PAGE_SHIFT))
@@ -97,8 +91,6 @@
return (paddr << 1) >> 1;
}
-#undef __pa
-#undef __va
#define __pa(x) (virt_to_maddr(x))
#define __va(x) ({xen_va _v; _v.l = (long) (x); _v.f.reg = -1;
_v.p;})
--
yamahata
_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@lists.xensource.com
http://lists.xensource.com/xen-ia64-devel
