[Xen-changelog] Minor clean ups of time.c and partial build fixes for 2.4

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User smh22@xxxxxxxxxxxxxxxxxxxx
# Node ID 6a83d157a391d246dfb8bae6a936f6f8266a5818
# Parent  ae51fa1d32b23066c4342bbeb5f4dc401b82ea37
Minor clean ups of time.c and partial build fixes for 2.4

diff -r ae51fa1d32b2 -r 6a83d157a391 linux-2.4-xen-sparse/arch/xen/Makefile
--- a/linux-2.4-xen-sparse/arch/xen/Makefile    Mon Aug  1 09:26:51 2005
+++ b/linux-2.4-xen-sparse/arch/xen/Makefile    Mon Aug  1 10:45:07 2005
@@ -61,7 +61,7 @@
 SUBDIRS += arch/xen/drivers/evtchn
 SUBDIRS += arch/xen/drivers/blkif
 SUBDIRS += arch/xen/drivers/netif
-SUBDIRS += arch/xen/drivers/usbif
+#SUBDIRS += arch/xen/drivers/usbif
 SUBDIRS += arch/xen/drivers/balloon
 ifdef CONFIG_XEN_PRIVILEGED_GUEST
 SUBDIRS += arch/xen/drivers/dom0 
diff -r ae51fa1d32b2 -r 6a83d157a391 linux-2.4-xen-sparse/mkbuildtree
--- a/linux-2.4-xen-sparse/mkbuildtree  Mon Aug  1 09:26:51 2005
+++ b/linux-2.4-xen-sparse/mkbuildtree  Mon Aug  1 10:45:07 2005
@@ -102,8 +102,8 @@
 relative_lndir ${RS}
 rm -f mkbuildtree
 
-set ${RS}/../linux-2.6.*-xen-sparse
-[ "$1" == "${RS}/../linux-2.6.*-xen-parse" ] && { echo "no Linux 2.6 sparse 
tree at ${RS}/../linux-2.6.*-xen-sparse"; exit 1; }
+set ${RS}/../linux-2.6-xen-sparse
+[ "$1" == "${RS}/../linux-2.6-xen-parse" ] && { echo "no Linux 2.6 sparse tree 
at ${RS}/../linux-2.6-xen-sparse"; exit 1; }
 LINUX_26="$1"
 
 
diff -r ae51fa1d32b2 -r 6a83d157a391 
linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c  Mon Aug  1 09:26:51 2005
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c  Mon Aug  1 10:45:07 2005
@@ -295,14 +295,11 @@
        struct vcpu_time_info   *src;
        struct shadow_time_info *dst;
 
-       src = &HYPERVISOR_shared_info->vcpu_time[smp_processor_id()];
-       dst = &per_cpu(shadow_time, smp_processor_id());
+       src = &HYPERVISOR_shared_info->vcpu_time[cpu]; 
+       dst = &per_cpu(shadow_time, cpu); 
 
        return (dst->version == src->time_version2);
 }
-
-#define TIME_VALUES_UP_TO_DATE \
- ({ rmb(); (shadow_time_version == HYPERVISOR_shared_info->time_version2); })
 
 /*
  * This is a special lock that is owned by the CPU and holds the index
diff -r ae51fa1d32b2 -r 6a83d157a391 
linux-2.6-xen-sparse/include/asm-xen/hypervisor.h
--- a/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h Mon Aug  1 09:26:51 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h Mon Aug  1 10:45:07 2005
@@ -46,6 +46,8 @@
 #  else
 #   include <asm-generic/pgtable-nopmd.h>
 #  endif
+# else
+#  define pud_t pgd_t
 # endif
 #endif
 

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