ia64/xen-unstable

changeset 1100:7a9e36d29982

bitkeeper revision 1.733 (4033c881640VDHdXFsEr2MkEnXSo5w)

ide-disk.c, apic.c:
Remove noisy output in Xen. Make IDE startup more informative.
author kaf24@scramble.cl.cam.ac.uk
date Wed Feb 18 20:18:09 2004 +0000 (2004-02-18)
parents 42978d167ae5
children 461c357d9b39
files xen/arch/i386/apic.c xen/drivers/ide/ide-disk.c
line diff
     1.1 --- a/xen/arch/i386/apic.c	Wed Feb 18 11:52:29 2004 +0000
     1.2 +++ b/xen/arch/i386/apic.c	Wed Feb 18 20:18:09 2004 +0000
     1.3 @@ -678,8 +678,8 @@ int reprogram_ac_timer(s_time_t timeout)
     1.4      expire = timeout - now; /* value from now */
     1.5  
     1.6      if (expire <= 0) {
     1.7 -        printk("APICT[%02d] Timeout in the past 0x%08X%08X > 0x%08X%08X\n", 
     1.8 -               cpu, (u32)(now>>32), (u32)now, (u32)(timeout>>32),(u32)timeout);
     1.9 +        Dprintk("APICT[%02d] Timeout in the past 0x%08X%08X > 0x%08X%08X\n", 
    1.10 +                cpu, (u32)(now>>32), (u32)now, (u32)(timeout>>32),(u32)timeout);
    1.11          return 0;       /* timeout value in the past */
    1.12      }
    1.13  
    1.14 @@ -694,11 +694,11 @@ int reprogram_ac_timer(s_time_t timeout)
    1.15      apic_tmict = (((u64)bus_scale) * expire)>>18;
    1.16  
    1.17      if (apic_tmict >= 0xffffffff) {
    1.18 -        printk("APICT[%02d] Timeout value too large\n", cpu);
    1.19 +        Dprintk("APICT[%02d] Timeout value too large\n", cpu);
    1.20          apic_tmict = 0xffffffff;
    1.21      }
    1.22      if (apic_tmict == 0) {
    1.23 -        printk("APICT[%02d] timeout value too small\n", cpu);
    1.24 +        Dprintk("APICT[%02d] timeout value too small\n", cpu);
    1.25          return 0;
    1.26      }
    1.27  
    1.28 @@ -706,8 +706,6 @@ int reprogram_ac_timer(s_time_t timeout)
    1.29      /* Program the timer. */
    1.30      apic_write(APIC_TMICT, (unsigned long)apic_tmict);
    1.31  
    1.32 -    TRC(printk("APICT[%02d] reprog(): expire=%lld %u\n",
    1.33 -               cpu, expire, apic_tmict));
    1.34      return 1;
    1.35  }
    1.36  
     2.1 --- a/xen/drivers/ide/ide-disk.c	Wed Feb 18 11:52:29 2004 +0000
     2.2 +++ b/xen/drivers/ide/ide-disk.c	Wed Feb 18 20:18:09 2004 +0000
     2.3 @@ -1399,7 +1399,9 @@ static void idedisk_setup (ide_drive_t *
     2.4  #ifdef CONFIG_BLK_DEV_IDEDMA
     2.5  	if (drive->using_dma)
     2.6  		(void) HWIF(drive)->dmaproc(ide_dma_verbose, drive);
     2.7 +	else
     2.8  #endif /* CONFIG_BLK_DEV_IDEDMA */
     2.9 +		printk(" PIO (slow!)");
    2.10  	printk("\n");
    2.11  
    2.12  	drive->mult_count = 0;