aboutsummaryrefslogtreecommitdiffstats
path: root/xen/arch/x86/sysctl.c
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2011-01-14 14:07:39 +0000
committerKeir Fraser <keir@xen.org>2011-01-14 14:07:39 +0000
commit22154402c7d7c358024c9aeaa7506d78f35363ae (patch)
tree8b73bc65da427cea217afd59cfd825c46f105d17 /xen/arch/x86/sysctl.c
parentf573a5226aa09eadd9cef7849b857a2bcea7443b (diff)
downloadxen-22154402c7d7c358024c9aeaa7506d78f35363ae.tar.gz
xen-22154402c7d7c358024c9aeaa7506d78f35363ae.tar.bz2
xen-22154402c7d7c358024c9aeaa7506d78f35363ae.zip
x86 sysctl: Remove unused CPU hotplug status stuff.
Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/arch/x86/sysctl.c')
-rw-r--r--xen/arch/x86/sysctl.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c
index ac7b56a29b..7bd20b9d0d 100644
--- a/xen/arch/x86/sysctl.c
+++ b/xen/arch/x86/sysctl.c
@@ -41,7 +41,7 @@ extern int __node_distance(int a, int b);
long arch_do_sysctl(
struct xen_sysctl *sysctl, XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl)
{
- long ret = 0, status;
+ long ret = 0;
switch ( sysctl->cmd )
{
@@ -167,41 +167,19 @@ long arch_do_sysctl(
{
unsigned int cpu = sysctl->u.cpu_hotplug.cpu;
- if (cpu_present(cpu)) {
- status = cpu_online(cpu) ? XEN_CPU_HOTPLUG_STATUS_ONLINE :
- XEN_CPU_HOTPLUG_STATUS_OFFLINE;
- } else {
- status = -EINVAL;
- }
-
switch ( sysctl->u.cpu_hotplug.op )
{
case XEN_SYSCTL_CPU_HOTPLUG_ONLINE:
ret = cpu_up(cpu);
- /*
- * In the case of a true hotplug, this CPU wasn't present
- * before, so return the 'new' status for it.
- */
- if (ret == 0 && status == -EINVAL)
- status = XEN_CPU_HOTPLUG_STATUS_NEW;
break;
case XEN_SYSCTL_CPU_HOTPLUG_OFFLINE:
ret = continue_hypercall_on_cpu(
0, cpu_down_helper, (void *)(unsigned long)cpu);
break;
- case XEN_SYSCTL_CPU_HOTPLUG_STATUS:
- ret = 0;
- break;
default:
ret = -EINVAL;
break;
}
-
- /*
- * If the operation was successful, return the old status.
- */
- if (ret >= 0)
- ret = status;
}
break;