[IA64] Map cpu_to_node table with xencomm for physinfo sysctl

Previously stubbed out.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>

diff --git a/arch/ia64/xen/xcom_privcmd.c b/arch/ia64/xen/xcom_privcmd.c
index efbd320ff071724e0bcf27ff2e768e8fc30377ee..7462b9a61faeefb8a6f1393994206a7c45bf6989 100644 (file)
--- a/arch/ia64/xen/xcom_privcmd.c
+++ b/arch/ia64/xen/xcom_privcmd.c
@@ -78,12 +78,6 @@ xencomm_privcmd_platform_op(privcmd_hypercall_t *hypercall)
        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_t *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_t *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,
-                                    (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);
+                                    (void *)desc);
                break;
-#endif
        default:
                printk("%s: unknown sysctl cmd %d\n", __func__, kern_op.cmd);
                return -ENOSYS;