[Xen-changelog] [xen-unstable] x86: Clean up pickle_domptr().

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1232987656 0
# Node ID beba88f6f90d24203c69585ab39641a5b9e8db88
# Parent  fa5887d901109bde1721302c93f3aff7ccc1e5fa
x86: Clean up pickle_domptr().
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/include/asm-x86/mm.h |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff -r fa5887d90110 -r beba88f6f90d xen/include/asm-x86/mm.h
--- a/xen/include/asm-x86/mm.h  Mon Jan 26 16:21:21 2009 +0000
+++ b/xen/include/asm-x86/mm.h  Mon Jan 26 16:34:16 2009 +0000
@@ -166,13 +166,8 @@ struct page_info
 #endif
 
 #if defined(__i386__)
-#define pickle_domptr(_d)   ((u32)(unsigned long)(_d))
-static inline struct domain *unpickle_domptr(u32 _domain)
-{ return (_domain & 1) ? NULL : (void *)_domain; }
 #define PRtype_info "08lx" /* should only be used for printk's */
 #elif defined(__x86_64__)
-#define unpickle_domptr(d) ((struct domain *)(d))
-#define pickle_domptr(d) ((unsigned long)(d))
 #define PRtype_info "016lx"/* should only be used for printk's */
 #endif
 
@@ -185,8 +180,8 @@ static inline struct domain *unpickle_do
 /* OOS fixup entries */
 #define SHADOW_OOS_FIXUPS 2
 
-#define page_get_owner(_p)    (unpickle_domptr((_p)->u.inuse._domain))
-#define page_set_owner(_p,_d) ((_p)->u.inuse._domain = pickle_domptr(_d))
+#define page_get_owner(_p)    ((struct domain *)(_p)->u.inuse._domain)
+#define page_set_owner(_p,_d) ((_p)->u.inuse._domain = (unsigned long)(_d))
 
 #define maddr_get_owner(ma)   (page_get_owner(maddr_to_page((ma))))
 #define vaddr_get_owner(va)   (page_get_owner(virt_to_page((va))))

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