[Xen-changelog] [xen-unstable] PM: only include XEN_SYSCTL_{get_pmstat, pm_op} if HAVE_ACPI

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1329308657 0
# Node ID b9b4a28dfeda5a8add507dfd5fe139dbac3060d0
# Parent  dfd6928609080bfa0875c683ca99419e3538618e
PM: only include XEN_SYSCTL_{get_pmstat,pm_op} if HAVE_ACPI

These hypercalls are currently ACPI specific and implemented in
xen/drivers/acpi which is not implemented on ARM.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: keir@xxxxxxx
Committed-by: Ian Campbell <Ian.Campbell@xxxxxxxxxx>
---


diff -r dfd692860908 -r b9b4a28dfeda xen/Rules.mk
--- a/xen/Rules.mk      Wed Feb 15 12:24:17 2012 +0000
+++ b/xen/Rules.mk      Wed Feb 15 12:24:17 2012 +0000
@@ -50,6 +50,7 @@
 CFLAGS-$(perfc)         += -DPERF_COUNTERS
 CFLAGS-$(perfc_arrays)  += -DPERF_ARRAYS
 CFLAGS-$(lock_profile)  += -DLOCK_PROFILE
+CFLAGS-$(HAS_ACPI)      += -DHAS_ACPI
 CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER
 
 ifneq ($(max_phys_cpus),)
diff -r dfd692860908 -r b9b4a28dfeda xen/arch/arm/dummy.S
--- a/xen/arch/arm/dummy.S      Wed Feb 15 12:24:17 2012 +0000
+++ b/xen/arch/arm/dummy.S      Wed Feb 15 12:24:17 2012 +0000
@@ -16,13 +16,11 @@
 DUMMY(__cpu_die);
 DUMMY(__cpu_disable);
 DUMMY(__cpu_up);
-DUMMY(do_get_pm_info);
 DUMMY(domain_get_maximum_gpfn);
 DUMMY(domain_relinquish_resources);
 DUMMY(domain_set_time_offset);
 DUMMY(dom_cow);
 DUMMY(donate_page);
-DUMMY(do_pm_op);
 DUMMY(flush_tlb_mask);
 DUMMY(free_vcpu_guest_context);
 DUMMY(get_page);
diff -r dfd692860908 -r b9b4a28dfeda xen/common/sysctl.c
--- a/xen/common/sysctl.c       Wed Feb 15 12:24:17 2012 +0000
+++ b/xen/common/sysctl.c       Wed Feb 15 12:24:17 2012 +0000
@@ -224,6 +224,7 @@
     }
     break;
 
+#ifdef HAS_ACPI
     case XEN_SYSCTL_get_pmstat:
     {
         ret = xsm_get_pmstat();
@@ -259,6 +260,7 @@
         }
     }
     break;
+#endif
 
     case XEN_SYSCTL_page_offline_op:
     {

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