# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1179777358 21600
# Node ID 1d74c51c2d5aefbb49b27ec123ad09965c40d775
# Parent f8b0d7a46b4d3c8d71650588883e8bfd409b7dd1
[IA64] memmap: preliminary header file clean up
Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
xen/include/asm-ia64/bundle.h | 2 ++
xen/include/asm-ia64/dom_fw.h | 5 +++--
xen/include/asm-ia64/domain.h | 4 ----
xen/include/public/arch-ia64.h | 4 ++++
4 files changed, 9 insertions(+), 6 deletions(-)
diff -r f8b0d7a46b4d -r 1d74c51c2d5a xen/include/asm-ia64/bundle.h
--- a/xen/include/asm-ia64/bundle.h Mon May 21 13:54:39 2007 -0600
+++ b/xen/include/asm-ia64/bundle.h Mon May 21 13:55:58 2007 -0600
@@ -223,8 +223,10 @@ typedef union U_INST64 {
INST64_M47 M47; // purge translation entry
} INST64;
+#ifdef __XEN__
extern unsigned long __vmx_get_domain_bundle(unsigned long iip, IA64_BUNDLE
*pbundle);
extern IA64_BUNDLE __get_domain_bundle(unsigned long iip);
+#endif
#define MASK_41 ((unsigned long)0x1ffffffffff)
diff -r f8b0d7a46b4d -r 1d74c51c2d5a xen/include/asm-ia64/dom_fw.h
--- a/xen/include/asm-ia64/dom_fw.h Mon May 21 13:54:39 2007 -0600
+++ b/xen/include/asm-ia64/dom_fw.h Mon May 21 13:55:58 2007 -0600
@@ -4,8 +4,6 @@
* Copyright (C) 2004 Hewlett-Packard Co
* Dan Magenheimer (dan.magenheimer@xxxxxx)
*/
-
-#include <linux/efi.h>
/* Portion of guest physical memory space reserved for PAL/SAL/EFI/ACPI
data and code. */
@@ -184,9 +182,12 @@
/* Additionnal OEM SAL. */
#define SAL_XEN_SAL_RETURN 0x02000000
+#ifdef __XEN__
+#include <linux/efi.h>
extern struct ia64_pal_retval xen_pal_emulator(u64, u64, u64, u64);
extern struct sal_ret_values sal_emulator (long index, unsigned long in1,
unsigned long in2, unsigned long in3, unsigned long in4, unsigned long in5,
unsigned long in6, unsigned long in7);
extern struct ia64_pal_retval pal_emulator_static (unsigned long);
extern efi_status_t efi_emulator (struct pt_regs *regs, unsigned long *fault);
extern int dom_fw_setup (struct domain *, unsigned long bp_mpa, unsigned long
maxmem);
+#endif
diff -r f8b0d7a46b4d -r 1d74c51c2d5a xen/include/asm-ia64/domain.h
--- a/xen/include/asm-ia64/domain.h Mon May 21 13:54:39 2007 -0600
+++ b/xen/include/asm-ia64/domain.h Mon May 21 13:55:58 2007 -0600
@@ -208,10 +208,6 @@ struct arch_vcpu {
#include <asm/uaccess.h> /* for KERNEL_DS */
#include <asm/pgtable.h>
-/* Guest physical address of IO ports space. */
-#define IO_PORTS_PADDR 0x00000ffffc000000UL
-#define IO_PORTS_SIZE 0x0000000004000000UL
-
int
do_perfmon_op(unsigned long cmd,
XEN_GUEST_HANDLE(void) arg1, unsigned long arg2);
diff -r f8b0d7a46b4d -r 1d74c51c2d5a xen/include/public/arch-ia64.h
--- a/xen/include/public/arch-ia64.h Mon May 21 13:54:39 2007 -0600
+++ b/xen/include/public/arch-ia64.h Mon May 21 13:55:58 2007 -0600
@@ -77,6 +77,10 @@ typedef unsigned long xen_ulong_t;
#define MEM_G (1UL << 30)
#define MEM_M (1UL << 20)
+
+/* Guest physical address of IO ports space. */
+#define IO_PORTS_PADDR 0x00000ffffc000000UL
+#define IO_PORTS_SIZE 0x0000000004000000UL
#define MMIO_START (3 * MEM_G)
#define MMIO_SIZE (512 * MEM_M)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home