WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] [IA64] clean up of xenpage.h

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] [IA64] clean up of xenpage.h
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Wed, 22 Oct 2008 07:51:12 -0700
Delivery-date: Wed, 22 Oct 2008 07:54:58 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
# Date 1224235497 -32400
# Node ID e23c1f241c7b3ba68fe4686328a6cfdd3f18cd51
# Parent  07558e1876e451290bdfd0947fce7c91a5db7818
[IA64] clean up of xenpage.h

remove nasty undefs in xenpage.h.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 xen/include/asm-ia64/linux-xen/asm/page.h |    2 ++
 xen/include/asm-ia64/xenpage.h            |    8 --------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff -r 07558e1876e4 -r e23c1f241c7b 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 @@ do {                                          \
 
 #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 @@ extern unsigned long max_low_pfn;
 
 #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 -r e23c1f241c7b 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 @@ static inline unsigned long __virt_to_ma
 #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 @@ static inline u64 pa_clear_uc(u64 paddr)
     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;})
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] [IA64] clean up of xenpage.h, Xen patchbot-unstable <=