1.1 --- a/tools/python/xen/lowlevel/xc/xc.c	Mon Apr 12 18:28:33 2010 +0100
     1.2 +++ b/tools/python/xen/lowlevel/xc/xc.c	Tue Apr 13 08:37:16 2010 +0100
     1.3 @@ -1179,7 +1179,6 @@ static PyObject *pyxc_physinfo(XcObject 
     1.4                              "nr_nodes",         pinfo.nr_nodes,
     1.5                              "threads_per_core", pinfo.threads_per_core,
     1.6                              "cores_per_socket", pinfo.cores_per_socket,
     1.7 -                            "sockets_per_node", pinfo.sockets_per_node,
     1.8                              "nr_cpus",          pinfo.nr_cpus, 
     1.9                              "total_memory",     pages_to_kib(pinfo.total_pages),
    1.10                              "free_memory",      pages_to_kib(pinfo.free_pages),

     2.1 --- a/tools/python/xen/xend/XendNode.py	Mon Apr 12 18:28:33 2010 +0100
     2.2 +++ b/tools/python/xen/xend/XendNode.py	Tue Apr 13 08:37:16 2010 +0100
     2.3 @@ -931,7 +931,6 @@ class XendNode:
     2.4                        'nr_nodes',
     2.5                        'cores_per_socket',
     2.6                        'threads_per_core',
     2.7 -                      'sockets_per_node',
     2.8                        'cpu_mhz',
     2.9                        'hw_caps',
    2.10                        'virt_caps',

     3.1 --- a/xen/arch/x86/sysctl.c	Mon Apr 12 18:28:33 2010 +0100
     3.2 +++ b/xen/arch/x86/sysctl.c	Tue Apr 13 08:37:16 2010 +0100
     3.3 @@ -63,9 +63,6 @@ long arch_do_sysctl(
     3.4          pi->nr_nodes = num_online_nodes();
     3.5          pi->max_node_id = last_node(node_online_map);
     3.6          pi->max_cpu_id = last_cpu(cpu_online_map);
     3.7 -        pi->sockets_per_node = 
     3.8 -            pi->nr_cpus / 
     3.9 -            (pi->nr_nodes * pi->cores_per_socket * pi->threads_per_core);
    3.10          pi->total_pages = total_pages;
    3.11          pi->free_pages = avail_domheap_pages();
    3.12          pi->scrub_pages = 0;

     4.1 --- a/xen/include/public/sysctl.h	Mon Apr 12 18:28:33 2010 +0100
     4.2 +++ b/xen/include/public/sysctl.h	Tue Apr 13 08:37:16 2010 +0100
     4.3 @@ -93,7 +93,6 @@ DEFINE_XEN_GUEST_HANDLE(xen_sysctl_tbuf_
     4.4  struct xen_sysctl_physinfo {
     4.5      uint32_t threads_per_core;
     4.6      uint32_t cores_per_socket;
     4.7 -    uint32_t sockets_per_node;
     4.8      uint32_t nr_cpus, max_cpu_id;
     4.9      uint32_t nr_nodes, max_node_id;
    4.10      uint32_t cpu_khz;