ia64/xen-unstable

changeset 5944:6a83d157a391

Minor clean ups of time.c and partial build fixes for 2.4
author smh22@firebug.cl.cam.ac.uk
date Mon Aug 01 10:45:07 2005 +0000 (2005-08-01)
parents ae51fa1d32b2
children 0db6a59abb95
files linux-2.4-xen-sparse/arch/xen/Makefile linux-2.4-xen-sparse/mkbuildtree linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c linux-2.6-xen-sparse/include/asm-xen/hypervisor.h
line diff
     1.1 --- a/linux-2.4-xen-sparse/arch/xen/Makefile	Mon Aug 01 09:26:51 2005 +0000
     1.2 +++ b/linux-2.4-xen-sparse/arch/xen/Makefile	Mon Aug 01 10:45:07 2005 +0000
     1.3 @@ -61,7 +61,7 @@ SUBDIRS += arch/xen/drivers/console
     1.4  SUBDIRS += arch/xen/drivers/evtchn
     1.5  SUBDIRS += arch/xen/drivers/blkif
     1.6  SUBDIRS += arch/xen/drivers/netif
     1.7 -SUBDIRS += arch/xen/drivers/usbif
     1.8 +#SUBDIRS += arch/xen/drivers/usbif
     1.9  SUBDIRS += arch/xen/drivers/balloon
    1.10  ifdef CONFIG_XEN_PRIVILEGED_GUEST
    1.11  SUBDIRS += arch/xen/drivers/dom0 
     2.1 --- a/linux-2.4-xen-sparse/mkbuildtree	Mon Aug 01 09:26:51 2005 +0000
     2.2 +++ b/linux-2.4-xen-sparse/mkbuildtree	Mon Aug 01 10:45:07 2005 +0000
     2.3 @@ -102,8 +102,8 @@ for i in `find . -type l`; do rm -f $i; 
     2.4  relative_lndir ${RS}
     2.5  rm -f mkbuildtree
     2.6  
     2.7 -set ${RS}/../linux-2.6.*-xen-sparse
     2.8 -[ "$1" == "${RS}/../linux-2.6.*-xen-parse" ] && { echo "no Linux 2.6 sparse tree at ${RS}/../linux-2.6.*-xen-sparse"; exit 1; }
     2.9 +set ${RS}/../linux-2.6-xen-sparse
    2.10 +[ "$1" == "${RS}/../linux-2.6-xen-parse" ] && { echo "no Linux 2.6 sparse tree at ${RS}/../linux-2.6-xen-sparse"; exit 1; }
    2.11  LINUX_26="$1"
    2.12  
    2.13  
     3.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c	Mon Aug 01 09:26:51 2005 +0000
     3.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/time.c	Mon Aug 01 10:45:07 2005 +0000
     3.3 @@ -295,15 +295,12 @@ static inline int time_values_up_to_date
     3.4  	struct vcpu_time_info   *src;
     3.5  	struct shadow_time_info *dst;
     3.6  
     3.7 -	src = &HYPERVISOR_shared_info->vcpu_time[smp_processor_id()];
     3.8 -	dst = &per_cpu(shadow_time, smp_processor_id());
     3.9 +	src = &HYPERVISOR_shared_info->vcpu_time[cpu]; 
    3.10 +	dst = &per_cpu(shadow_time, cpu); 
    3.11  
    3.12  	return (dst->version == src->time_version2);
    3.13  }
    3.14  
    3.15 -#define TIME_VALUES_UP_TO_DATE \
    3.16 - ({ rmb(); (shadow_time_version == HYPERVISOR_shared_info->time_version2); })
    3.17 -
    3.18  /*
    3.19   * This is a special lock that is owned by the CPU and holds the index
    3.20   * register we are working with.  It is required for NMI access to the
     4.1 --- a/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h	Mon Aug 01 09:26:51 2005 +0000
     4.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/hypervisor.h	Mon Aug 01 10:45:07 2005 +0000
     4.3 @@ -46,6 +46,8 @@
     4.4  #  else
     4.5  #   include <asm-generic/pgtable-nopmd.h>
     4.6  #  endif
     4.7 +# else
     4.8 +#  define pud_t pgd_t
     4.9  # endif
    4.10  #endif
    4.11