---

yaml --- r: 93152 b: refs/heads/master c: 3b4724b h: refs/heads/master v: v3
git-mirror · Apr 24, 2008 · 441dc89 · 441dc89
1 parent 2d7bb73
commit 441dc89
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git 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
@@ -8,27 +8,15 @@
 
 #include <xen/features.h>
 
-#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) })