From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xensource.com
Cc: Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH 06/12] PM: only include XEN_SYSCTL_{get_pmstat, pm_op} if HAVE_ACPI
Date: Fri, 20 Jan 2012 12:06:32 +0000 [thread overview]
Message-ID: <1327061198-29854-6-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1327061025.30054.21.camel@zakaz.uk.xensource.com>
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@citrix.com>
---
xen/Rules.mk | 1 +
xen/arch/arm/dummy.S | 2 --
xen/common/sysctl.c | 2 ++
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/xen/Rules.mk b/xen/Rules.mk
index 59c7dd7..b7b54f6 100644
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -50,6 +50,7 @@ CFLAGS-$(crash_debug) += -DCRASH_DEBUG
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 --git a/xen/arch/arm/dummy.S b/xen/arch/arm/dummy.S
index 1287e0b..3bf5226 100644
--- a/xen/arch/arm/dummy.S
+++ b/xen/arch/arm/dummy.S
@@ -16,13 +16,11 @@ DUMMY(create_grant_host_mapping);
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 --git a/xen/common/sysctl.c b/xen/common/sysctl.c
index f8f7cf8..fef0589 100644
--- a/xen/common/sysctl.c
+++ b/xen/common/sysctl.c
@@ -224,6 +224,7 @@ long do_sysctl(XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl)
}
break;
+#ifdef HAS_ACPI
case XEN_SYSCTL_get_pmstat:
{
ret = xsm_get_pmstat();
@@ -259,6 +260,7 @@ long do_sysctl(XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl)
}
}
break;
+#endif
case XEN_SYSCTL_page_offline_op:
{
--
1.7.2.5
next prev parent reply other threads:[~2012-01-20 12:06 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-20 12:03 [PATCH 00/12] ARM: Slim down dummy.S Ian Campbell
2012-01-20 12:06 ` [PATCH 01/12] arm: add a missing local-vars comment Ian Campbell
2012-01-20 12:06 ` [PATCH 02/12] arm: define some more cp15 registers Ian Campbell
2012-01-20 12:06 ` [PATCH 03/12] arm: align some register bit definitions Ian Campbell
2012-01-20 12:06 ` [PATCH 04/12] arm: remove some unnecessary symbols from dummy.S Ian Campbell
2012-01-20 12:06 ` [PATCH 05/12] arm: Add stub functions instead of using DUMMY Ian Campbell
2012-01-20 12:06 ` Ian Campbell [this message]
2012-01-20 12:06 ` [PATCH 07/12] xen: allow tmem to be disabled on platforms which do not support it (ARM) Ian Campbell
2012-01-20 12:19 ` Stefano Stabellini
2012-01-20 12:25 ` Tim Deegan
2012-01-20 12:34 ` Jan Beulich
2012-01-20 22:24 ` Dan M @ Oracle
2012-01-20 12:28 ` Ian Campbell
2012-01-20 12:36 ` Jan Beulich
2012-01-20 12:39 ` Ian Campbell
2012-01-20 12:51 ` Jan Beulich
2012-01-20 12:06 ` [PATCH 08/12] arm: Implement arch_get_xen_caps Ian Campbell
2012-01-20 12:06 ` [PATCH 09/12] xen: only map PV guest grants via iommu if HAS_PASSTHROUGH Ian Campbell
2012-01-20 12:38 ` Jan Beulich
2012-01-20 12:40 ` Ian Campbell
2012-01-20 12:52 ` Jan Beulich
2012-01-20 12:06 ` [PATCH 10/12] arm: stub out PoD Ian Campbell
2012-01-20 12:20 ` Stefano Stabellini
2012-01-20 12:29 ` Ian Campbell
2012-01-20 12:35 ` Tim Deegan
2012-01-20 12:40 ` Ian Campbell
2012-01-20 12:06 ` [PATCH 11/12] arm: define max_page Ian Campbell
2012-01-20 12:06 ` [PATCH 12/12] arm: Group remaining dummy symbols somewhat according to functionality Ian Campbell
2012-01-20 12:20 ` [PATCH 00/12] ARM: Slim down dummy.S Stefano Stabellini
-- strict thread matches above, loose matches on Subject: below --
2012-02-14 14:43 [PATCH 00/12 v2] " Ian Campbell
2012-02-14 14:43 ` [PATCH 06/12] PM: only include XEN_SYSCTL_{get_pmstat, pm_op} if HAVE_ACPI Ian Campbell
2012-02-14 18:32 ` Keir Fraser
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1327061198-29854-6-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).