ia64/xen-unstable

changeset 159:5cb48c40f82d

bitkeeper revision 1.30 (3e4ce849iTXwUfd875KoO7-fEimIHg)

e1000_osdep.h, ide-xeno.c, schedule.c, domain.c, ac_timer.c, io_apic.c:
Minor cleanups to local disc and new timer code.
author kaf24@labyrinth.cl.cam.ac.uk
date Fri Feb 14 12:59:53 2003 +0000 (2003-02-14)
parents 99a121f0ecff
children 2e843b71a026
files xen-2.4.16/arch/i386/io_apic.c xen-2.4.16/common/ac_timer.c xen-2.4.16/common/domain.c xen-2.4.16/common/schedule.c xen-2.4.16/drivers/ide/ide-xeno.c xen-2.4.16/drivers/net/e1000/e1000_osdep.h
line diff
     1.1 --- a/xen-2.4.16/arch/i386/io_apic.c	Fri Feb 14 12:26:26 2003 +0000
     1.2 +++ b/xen-2.4.16/arch/i386/io_apic.c	Fri Feb 14 12:59:53 2003 +0000
     1.3 @@ -788,7 +788,7 @@ void __init print_IO_APIC(void)
     1.4  	spin_unlock_irqrestore(&ioapic_lock, flags);
     1.5  
     1.6  	printk("\n");
     1.7 -	printk(KERN_DEBUG "IO APIC #%d..XXXX....\n", mp_ioapics[apic].mpc_apicid);
     1.8 +	printk(KERN_DEBUG "IO APIC #%d......\n", mp_ioapics[apic].mpc_apicid);
     1.9  	printk(KERN_DEBUG ".... register #00: %08X\n", *(int *)&reg_00);
    1.10  	printk(KERN_DEBUG ".......    : physical APIC id: %02X\n", reg_00.ID);
    1.11  	if (reg_00.__reserved_1 || reg_00.__reserved_2)
    1.12 @@ -826,6 +826,7 @@ void __init print_IO_APIC(void)
    1.13  			UNEXPECTED_IO_APIC();
    1.14  	}
    1.15  
    1.16 +#if 0
    1.17  	printk(KERN_DEBUG ".... IRQ redirection table:\n");
    1.18  
    1.19  	printk(KERN_DEBUG " NR Log Phy Mask Trig IRR Pol"
    1.20 @@ -870,6 +871,7 @@ void __init print_IO_APIC(void)
    1.21  			entry = irq_2_pin + entry->next;
    1.22  		}
    1.23  		printk("\n");
    1.24 +#endif
    1.25  	}
    1.26  
    1.27  	printk(KERN_INFO ".................................... done.\n");
     2.1 --- a/xen-2.4.16/common/ac_timer.c	Fri Feb 14 12:26:26 2003 +0000
     2.2 +++ b/xen-2.4.16/common/ac_timer.c	Fri Feb 14 12:59:53 2003 +0000
     2.3 @@ -66,7 +66,7 @@ static act_stats_t act_stats[NR_CPUS];
     2.4  
     2.5  /* local prototypes */
     2.6  static int  detach_ac_timer(struct ac_timer *timer);
     2.7 -static void ac_timer_debug(unsigned long);
     2.8 +/*static void ac_timer_debug(unsigned long);*/
     2.9  
    2.10  /*
    2.11   * add a timer.
     3.1 --- a/xen-2.4.16/common/domain.c	Fri Feb 14 12:26:26 2003 +0000
     3.2 +++ b/xen-2.4.16/common/domain.c	Fri Feb 14 12:59:53 2003 +0000
     3.3 @@ -580,7 +580,7 @@ int setup_guestos(struct task_struct *p,
     3.4          unsigned char nfsroot[70];
     3.5          snprintf(nfsroot, 70, opt_nfsroot, dom); 
     3.6          snprintf(boot, 200,
     3.7 -#if 1
     3.8 +#if 0
     3.9                  " root=/dev/nfs ip=%s:%s:%s:%s::eth0:off nfsroot=%s",
    3.10  #else
    3.11                  " ro root=/dev/xhda7 ip=%s:%s:%s:%s::eth0:off arfle=%s",
     4.1 --- a/xen-2.4.16/common/schedule.c	Fri Feb 14 12:26:26 2003 +0000
     4.2 +++ b/xen-2.4.16/common/schedule.c	Fri Feb 14 12:59:53 2003 +0000
     4.3 @@ -341,6 +341,6 @@ void schedulers_start(void) {
     4.4  	printk("Start schedulers\n");
     4.5  	__cli();
     4.6  	sched_timer(0);
     4.7 -	smp_call_function(sched_timer, NULL, 1, 1);
     4.8 +	smp_call_function((void *)sched_timer, NULL, 1, 1);
     4.9  	__sti();
    4.10  }
     5.1 --- a/xen-2.4.16/drivers/ide/ide-xeno.c	Fri Feb 14 12:26:26 2003 +0000
     5.2 +++ b/xen-2.4.16/drivers/ide/ide-xeno.c	Fri Feb 14 12:59:53 2003 +0000
     5.3 @@ -8,15 +8,13 @@
     5.4  void ide_probe_devices (xen_disk_info_t* xdi)
     5.5  {
     5.6      int loop;
     5.7 +    unsigned int unit;
     5.8      
     5.9      for (loop = 0; loop < MAX_HWIFS; ++loop) {
    5.10  
    5.11  	ide_hwif_t *hwif = &ide_hwifs[loop];
    5.12  	if (hwif->present) {
    5.13  
    5.14 -	    struct gendisk *gd = hwif->gd;
    5.15 -	    unsigned int unit;
    5.16 -
    5.17  	    for (unit = 0; unit < MAX_DRIVES; ++unit) {
    5.18  		unsigned long capacity;
    5.19  		ide_drive_t *drive = &hwif->drives[unit];
    5.20 @@ -28,10 +26,10 @@ void ide_probe_devices (xen_disk_info_t*
    5.21  		    xdi->count++;
    5.22  
    5.23  		    printk (KERN_ALERT "IDE-XENO %d\n", xdi->count);
    5.24 -		    printk (KERN_ALERT "  capacity  0x%x\n", capacity);
    5.25 -		    printk (KERN_ALERT "  head      0x%x\n", drive->bios_head);
    5.26 -		    printk (KERN_ALERT "  sector    0x%x\n", drive->bios_sect);
    5.27 -		    printk (KERN_ALERT "  cylinder  0x%x\n", drive->bios_cyl);
    5.28 +		    printk (KERN_ALERT "  capacity  0x%lx\n", capacity);
    5.29 +		    printk (KERN_ALERT "  head      0x%x\n",  drive->bios_head);
    5.30 +		    printk (KERN_ALERT "  sector    0x%x\n",  drive->bios_sect);
    5.31 +		    printk (KERN_ALERT "  cylinder  0x%x\n",  drive->bios_cyl);
    5.32  		}
    5.33  	    }
    5.34  	}
     6.1 --- a/xen-2.4.16/drivers/net/e1000/e1000_osdep.h	Fri Feb 14 12:26:26 2003 +0000
     6.2 +++ b/xen-2.4.16/drivers/net/e1000/e1000_osdep.h	Fri Feb 14 12:59:53 2003 +0000
     6.3 @@ -44,7 +44,6 @@
     6.4  #ifndef msec_delay
     6.5  #define msec_delay(x) {\
     6.6   	int s=jiffies+1+((x*HZ)/1000); \
     6.7 -	printk("mdelay(%d) called -- spin\n",x); \
     6.8  	while(jiffies<s); }
     6.9  
    6.10  #if 0