ia64/xen-unstable

changeset 142:4bd6c4bfc2b3

bitkeeper revision 1.26 (3e4938c9hNFygt8GXCkq3B5mRmOxrQ)

minor fixed due to messed up merge
author rn@wyvis.camb.intel-research.net
date Tue Feb 11 17:54:17 2003 +0000 (2003-02-11)
parents 2c1ef70cc49f
children 42a318e8648e
files xen-2.4.16/common/domain.c xen-2.4.16/include/xeno/ac_timer.h xenolinux-2.4.16-sparse/arch/xeno/kernel/time.c
line diff
     1.1 --- a/xen-2.4.16/common/domain.c	Tue Feb 11 16:51:47 2003 +0000
     1.2 +++ b/xen-2.4.16/common/domain.c	Tue Feb 11 17:54:17 2003 +0000
     1.3 @@ -224,7 +224,6 @@ int final_setup_guestos(struct task_stru
     1.4      l1_pgentry_t * l1tab;
     1.5      start_info_t * virt_startinfo_addr;
     1.6      unsigned long virt_stack_addr;
     1.7 -    unsigned long long time;
     1.8      unsigned long phys_l2tab;
     1.9      net_ring_t *net_ring;
    1.10      net_vif_t *net_vif;
    1.11 @@ -357,9 +356,7 @@ int setup_guestos(struct task_struct *p,
    1.12      unsigned long phys_l1tab, phys_l2tab;
    1.13      unsigned long cur_address, alloc_address;
    1.14      unsigned long virt_load_address, virt_stack_address, virt_shinfo_address;
    1.15 -    unsigned long virt_ftable_start, virt_ftable_end, ft_mapping;
    1.16      start_info_t  *virt_startinfo_address;
    1.17 -    unsigned long long time;
    1.18      unsigned long count;
    1.19      unsigned long alloc_index;
    1.20      l2_pgentry_t *l2tab, *l2start;
     2.1 --- a/xen-2.4.16/include/xeno/ac_timer.h	Tue Feb 11 16:51:47 2003 +0000
     2.2 +++ b/xen-2.4.16/include/xeno/ac_timer.h	Tue Feb 11 17:54:17 2003 +0000
     2.3 @@ -20,7 +20,7 @@
     2.4  #ifndef _AC_TIMER_H_
     2.5  #define _AC_TIMER_H_
     2.6  
     2.7 -#include <time.h> /* include notion of time */
     2.8 +#include <xeno/time.h> /* include notion of time */
     2.9  
    2.10  /*
    2.11   * The Xen Hypervisor provides two types of timers:
     3.1 --- a/xenolinux-2.4.16-sparse/arch/xeno/kernel/time.c	Tue Feb 11 16:51:47 2003 +0000
     3.2 +++ b/xenolinux-2.4.16-sparse/arch/xeno/kernel/time.c	Tue Feb 11 17:54:17 2003 +0000
     3.3 @@ -337,7 +337,6 @@ void __init time_init(void)
     3.4  
     3.5  	do_gettimeofday(&xtime);
     3.6  	last_irq = (((long long)xtime.tv_sec) * 1000000) + xtime.tv_usec;
     3.7 -	printk("last: %lld\n", last_irq);
     3.8  
     3.9      setup_irq(TIMER_IRQ, &irq_timer);
    3.10