From 441dc8994abb718fc4bc3547ba729d17a93d8648 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Mon, 17 Mar 2008 16:37:10 -0700 Subject: [PATCH] --- yaml --- r: 93152 b: refs/heads/master c: 3b4724b0e60cdfdc2679ee7135f3a234c74c2b83 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/xen/page.h | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 6b5a1cbf3198..6fd35f2a8a30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 947a69c90c0d07ac7f214e46dabbe49f2a230e00 +refs/heads/master: 3b4724b0e60cdfdc2679ee7135f3a234c74c2b83 diff --git a/trunk/include/xen/page.h b/trunk/include/xen/page.h index 031ef22a971e..1742f60828f3 100644 --- a/trunk/include/xen/page.h +++ b/trunk/include/xen/page.h @@ -8,27 +8,15 @@ #include -#ifdef CONFIG_X86_PAE /* Xen machine address */ typedef struct xmaddr { - unsigned long long maddr; + phys_addr_t maddr; } xmaddr_t; /* Xen pseudo-physical address */ typedef struct xpaddr { - unsigned long long paddr; + phys_addr_t paddr; } xpaddr_t; -#else -/* Xen machine address */ -typedef struct xmaddr { - unsigned long maddr; -} xmaddr_t; - -/* Xen pseudo-physical address */ -typedef struct xpaddr { - unsigned long paddr; -} xpaddr_t; -#endif #define XMADDR(x) ((xmaddr_t) { .maddr = (x) }) #define XPADDR(x) ((xpaddr_t) { .paddr = (x) })