[Xen-changelog] [xen-unstable] [IA64] PV-to-HVM prep for maddr.h

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

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 36b76e5514567dbf1a1b93f4a0decc4fb4bf1433
# Parent  7aaab04fd22e6ae3bc7c763c9a286bf3b435ac37
[IA64] PV-to-HVM prep for maddr.h

Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@xxxxxxxxxxxxxx>
Signed-off-by: Tomonari Horikoshi <t.horikoshi@xxxxxxxxxxxxxx>
[merged with existing maddr.h]
Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
 linux-2.6-xen-sparse/include/asm-ia64/maddr.h |   53 ++++++++++++++------------
 1 files changed, 30 insertions(+), 23 deletions(-)

diff -r 7aaab04fd22e -r 36b76e551456 
linux-2.6-xen-sparse/include/asm-ia64/maddr.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/maddr.h     Wed Aug 23 11:16:41 
2006 -0600
+++ b/linux-2.6-xen-sparse/include/asm-ia64/maddr.h     Wed Aug 23 12:56:10 
2006 -0600
@@ -1,19 +1,16 @@
 #ifndef _ASM_IA64_MADDR_H
 #define _ASM_IA64_MADDR_H
 
-#ifndef __ASSEMBLY__
+#include <linux/kernel.h>
+#include <asm/hypervisor.h>
+#include <xen/features.h>
+#include <xen/interface/xen.h>
+
 #ifdef CONFIG_XEN
 
-#define INVALID_P2M_ENTRY      (~0UL)
-
-#include <linux/kernel.h>
-#include <asm/hypervisor.h>
-#include <xen/features.h>      // to compile netback, netfront
-typedef unsigned long maddr_t; // to compile netback, netfront
-
+#define INVALID_P2M_ENTRY       (~0UL)
 
 /* XXX xen page size != page size */
-
 static inline unsigned long
 pfn_to_mfn_for_dma(unsigned long pfn)
 {
@@ -53,18 +50,6 @@ machine_to_phys_for_dma(unsigned long ma
        return phys;
 }
 
-#define set_phys_to_machine(pfn, mfn) do { } while (0)
-#define xen_machphys_update(mfn, pfn) do { } while (0)
-
-/* XXX to compile set_phys_to_machine(vaddr, FOREIGN_FRAME(m)) */
-#define FOREIGN_FRAME(m)        (INVALID_P2M_ENTRY)
-
-#define mfn_to_pfn(mfn)                        (mfn)
-#define mfn_to_virt(mfn)               (__va((mfn) << PAGE_SHIFT))
-#define pfn_to_mfn(pfn)                        (pfn)
-#define virt_to_mfn(virt)              (__pa(virt) >> PAGE_SHIFT)
-#define virt_to_machine(virt)          __pa(virt) // for tpmfront.c
-
 static inline unsigned long
 mfn_to_local_pfn(unsigned long mfn)
 {
@@ -75,7 +60,29 @@ mfn_to_local_pfn(unsigned long mfn)
        return pfn;
 }
 
-#endif /* CONFIG_XEN */
-#endif /* __ASSEMBLY__ */
+#else /* !CONFIG_XEN */
+
+#define pfn_to_mfn_for_dma(pfn) (pfn)
+#define mfn_to_pfn_for_dma(mfn) (mfn)
+#define phys_to_machine_for_dma(phys) (phys)
+#define machine_to_phys_for_dma(machine) (machine)
+#define mfn_to_local_pfn(mfn) (mfn)
+
+#endif /* !CONFIG_XEN */
+
+/* XXX to compile set_phys_to_machine(vaddr, FOREIGN_FRAME(m)) */
+#define FOREIGN_FRAME(m)        (INVALID_P2M_ENTRY)
+
+#define mfn_to_pfn(mfn) (mfn)
+#define pfn_to_mfn(pfn) (pfn)
+
+#define mfn_to_virt(mfn) (__va((mfn) << PAGE_SHIFT))
+#define virt_to_mfn(virt) (__pa(virt) >> PAGE_SHIFT)
+#define virt_to_machine(virt) __pa(virt) // for tpmfront.c
+
+#define set_phys_to_machine(pfn, mfn) do { } while (0)
+#define xen_machphys_update(mfn, pfn) do { } while (0)
+
+typedef unsigned long maddr_t; // to compile netback, netfront
 
 #endif /* _ASM_IA64_MADDR_H */

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