It seems some APIs in that file is dead code, this one is to
remove dead code or dom0 only code?
Signed-off-by: Yaozu (Eddie) Dong <eddie.dong@xxxxxxxxx>
diff --git a/arch/ia64/xen/Makefile b/arch/ia64/xen/Makefile
index 605b757..dc8fee6 100644
--- a/arch/ia64/xen/Makefile
+++ b/arch/ia64/xen/Makefile
@@ -5,7 +5,7 @@
KBUILD_AFLAGS += -D__IA64_ASM_PARAVIRTUALIZED_XEN
obj-y := hypercall.o time.o xenivt.o xensetup.o xen_pv_ops.o irq_xen.o
\
- hypervisor.o util.o xencomm.o xcom_hcall.o xcom_asm.o
paravirt_xen.o
+ hypervisor.o util.o xencomm.o xcom_hcall.o paravirt_xen.o
obj-y += ../kernel/ivt.o
diff --git a/arch/ia64/xen/xcom_asm.S b/arch/ia64/xen/xcom_asm.S
deleted file mode 100644
index 8747908..0000000
--- a/arch/ia64/xen/xcom_asm.S
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * xencomm suspend support
- * Support routines for Xen
- *
- * Copyright (C) 2005 Dan Magenheimer <dan.magenheimer@xxxxxx>
- */
-#include <asm/asmmacro.h>
-#include <xen/interface/xen.h>
-
-/*
- * Stub for suspend.
- * Just force the stacked registers to be written in memory.
- */
-GLOBAL_ENTRY(xencomm_arch_hypercall_suspend)
- ;;
- alloc r20=ar.pfs,0,0,6,0
- mov r2=__HYPERVISOR_sched_op
- ;;
- /* We don't want to deal with RSE. */
- flushrs
- mov r33=r32
- mov r32=2 // SCHEDOP_shutdown
- ;;
- break 0x1000
- ;;
- br.ret.sptk.many b0
-END(xencomm_arch_hypercall_suspend)
diff --git a/arch/ia64/xen/xcom_hcall.c b/arch/ia64/xen/xcom_hcall.c
index bfddbd7..4a89a74 100644
--- a/arch/ia64/xen/xcom_hcall.c
+++ b/arch/ia64/xen/xcom_hcall.c
@@ -401,17 +401,6 @@ xencomm_hypercall_memory_op(unsigned int cmd, void
*arg)
}
EXPORT_SYMBOL_GPL(xencomm_hypercall_memory_op);
-int
-xencomm_hypercall_suspend(unsigned long srec)
-{
- struct sched_shutdown arg;
-
- arg.reason = SHUTDOWN_suspend;
-
- return xencomm_arch_hypercall_suspend(
- xencomm_map_no_alloc(&arg, sizeof(arg)));
-}
-
long
xencomm_hypercall_vcpu_op(int cmd, int cpu, void *arg)
{
@@ -443,16 +432,3 @@ xencomm_hypercall_opt_feature(void *arg)
xencomm_map_no_alloc(arg,
sizeof(struct
xen_ia64_opt_feature)));
}
-
-int
-xencomm_hypercall_fpswa_revision(unsigned int *revision)
-{
- struct xencomm_handle *desc;
-
- desc = xencomm_map_no_alloc(revision, sizeof(*revision));
- if (desc == NULL)
- return -EINVAL;
-
- return xencomm_arch_hypercall_fpswa_revision(desc);
-}
-EXPORT_SYMBOL_GPL(xencomm_hypercall_fpswa_revision);
diff --git a/include/asm-ia64/xen/hypercall.h
b/include/asm-ia64/xen/hypercall.h
index 075b9e1..77dda9d 100644
--- a/include/asm-ia64/xen/hypercall.h
+++ b/include/asm-ia64/xen/hypercall.h
@@ -313,38 +313,7 @@ HYPERVISOR_unexpose_foreign_p2m(unsigned long gpfn,
domid_t domid)
}
#endif
-static inline int
-xencomm_arch_hypercall_perfmon_op(unsigned long cmd,
- struct xencomm_handle *arg,
- unsigned long count)
-{
- return _hypercall4(int, ia64_dom0vp_op,
- IA64_DOM0VP_perfmon, cmd, arg, count);
-}
-
-static inline int
-xencomm_arch_hypercall_fpswa_revision(struct xencomm_handle *arg)
-{
- return _hypercall2(int, ia64_dom0vp_op,
- IA64_DOM0VP_fpswa_revision, arg);
-}
-static inline int
-xencomm_arch_hypercall_ia64_debug_op(unsigned long cmd,
- unsigned long domain,
- struct xencomm_handle *arg)
-{
- return _hypercall3(int, ia64_debug_op, cmd, domain, arg);
-}
-
-static inline int
-HYPERVISOR_add_io_space(unsigned long phys_base,
- unsigned long sparse,
- unsigned long space_number)
-{
- return _hypercall4(int, ia64_dom0vp_op,
IA64_DOM0VP_add_io_space,
- phys_base, sparse, space_number);
-}
/* for balloon driver */
#define HYPERVISOR_update_va_mapping(va, new_val, flags) (0)
@@ -355,16 +324,9 @@ HYPERVISOR_add_io_space(unsigned long phys_base,
#define HYPERVISOR_callback_op xencomm_hypercall_callback_op
#define HYPERVISOR_multicall xencomm_hypercall_multicall
#define HYPERVISOR_xen_version xencomm_hypercall_xen_version
-#define HYPERVISOR_console_io xencomm_hypercall_console_io
-#define HYPERVISOR_hvm_op xencomm_hypercall_hvm_op
#define HYPERVISOR_memory_op xencomm_hypercall_memory_op
-#define HYPERVISOR_xenoprof_op xencomm_hypercall_xenoprof_op
-#define HYPERVISOR_perfmon_op xencomm_hypercall_perfmon_op
-#define HYPERVISOR_fpswa_revision xencomm_hypercall_fpswa_revision
-#define HYPERVISOR_suspend xencomm_hypercall_suspend
#define HYPERVISOR_vcpu_op xencomm_hypercall_vcpu_op
#define HYPERVISOR_opt_feature xencomm_hypercall_opt_feature
-#define HYPERVISOR_kexec_op xencomm_hypercall_kexec_op
/* to compile gnttab_copy_grant_page() in drivers/xen/core/gnttab.c */
#define HYPERVISOR_mmu_update(req, count, success_count, domid) ({
BUG(); 0; })
cleanup_dom0.patch2
Description: cleanup_dom0.patch2
_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel
|
Home