[Xen-changelog] [linux-2.6.18-xen] [IA64] Map cpu_to_node table with xencomm for physinfo sysctl

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1184087887 21600
# Node ID 86ac3059ab675a1c80ab02be513afb57b5e63efa
# Parent  e57b5bec937fe48ba4d2ba9a8976dffd332def05
[IA64] Map cpu_to_node table with xencomm for physinfo sysctl

Previously stubbed out.

Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
 arch/ia64/xen/xcom_privcmd.c |   29 +++++------------------------
 1 files changed, 5 insertions(+), 24 deletions(-)

diff -r e57b5bec937f -r 86ac3059ab67 arch/ia64/xen/xcom_privcmd.c
--- a/arch/ia64/xen/xcom_privcmd.c      Tue Jul 10 08:40:03 2007 -0600
+++ b/arch/ia64/xen/xcom_privcmd.c      Tue Jul 10 11:18:07 2007 -0600
@@ -78,12 +78,6 @@ xencomm_privcmd_platform_op(privcmd_hype
        return ret;
 }
 
-/*
- * Temporarily disable the NUMA PHYSINFO code until the rest of the
- * changes are upstream.
- */
-#undef IA64_NUMA_PHYSINFO
-
 static int
 xencomm_privcmd_sysctl(privcmd_hypercall_t *hypercall)
 {
@@ -114,9 +108,6 @@ xencomm_privcmd_sysctl(privcmd_hypercall
                                     (void *)desc);
                break;
        case XEN_SYSCTL_tbuf_op:
-#ifndef IA64_NUMA_PHYSINFO
-       case XEN_SYSCTL_physinfo:
-#endif
        case XEN_SYSCTL_sched_id:
                break;
        case XEN_SYSCTL_perfc_op:
@@ -181,27 +172,17 @@ xencomm_privcmd_sysctl(privcmd_hypercall
                                     (void *)desc);
                break;
 
-#ifdef IA64_NUMA_PHYSINFO
        case XEN_SYSCTL_physinfo:
                ret = xencomm_create(
-                       xen_guest_handle(kern_op.u.physinfo.memory_chunks),
-                       PUBLIC_MAXCHUNKS * sizeof(node_data_t),
+                       xen_guest_handle(kern_op.u.physinfo.cpu_to_node),
+                       kern_op.u.physinfo.max_cpu_id * sizeof(uint32_t),
                        &desc, GFP_KERNEL);
                if (ret)
                        return ret;
-               set_xen_guest_handle(kern_op.u.physinfo.memory_chunks,
+
+               set_xen_guest_handle(kern_op.u.physinfo.cpu_to_node,
                                     (void *)desc);
-
-               ret = xencomm_create(
-                       xen_guest_handle(kern_op.u.physinfo.cpu_to_node),
-                       PUBLIC_MAX_NUMNODES * sizeof(u64),
-                       &desc1, GFP_KERNEL);
-               if (ret)
-                       xencomm_free(desc);
-               set_xen_guest_handle(kern_op.u.physinfo.cpu_to_node,
-                                    (void *)desc1);
-               break;
-#endif
+               break;
        default:
                printk("%s: unknown sysctl cmd %d\n", __func__, kern_op.cmd);
                return -ENOSYS;

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