diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-02-18 20:18:09 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2004-02-18 20:18:09 +0000 |
| commit | 3e97bf27400e6c1f578b264f4ac40277a8aec033 (patch) | |
| tree | 46c88177b029e844876403acc46c7187c30a3c95 | |
| parent | e569dcbd220d3a54d2f9e77a864676f2bcbdb76c (diff) | |
| download | xen-3e97bf27400e6c1f578b264f4ac40277a8aec033.tar.gz xen-3e97bf27400e6c1f578b264f4ac40277a8aec033.tar.bz2 xen-3e97bf27400e6c1f578b264f4ac40277a8aec033.zip | |
bitkeeper revision 1.733 (4033c881640VDHdXFsEr2MkEnXSo5w)
ide-disk.c, apic.c:
Remove noisy output in Xen. Make IDE startup more informative.
| -rw-r--r-- | xen/arch/i386/apic.c | 10 | ||||
| -rw-r--r-- | xen/drivers/ide/ide-disk.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xen/arch/i386/apic.c b/xen/arch/i386/apic.c index b3cd649c9c..469890b488 100644 --- a/xen/arch/i386/apic.c +++ b/xen/arch/i386/apic.c @@ -678,8 +678,8 @@ int reprogram_ac_timer(s_time_t timeout) expire = timeout - now; /* value from now */ if (expire <= 0) { - printk("APICT[%02d] Timeout in the past 0x%08X%08X > 0x%08X%08X\n", - cpu, (u32)(now>>32), (u32)now, (u32)(timeout>>32),(u32)timeout); + Dprintk("APICT[%02d] Timeout in the past 0x%08X%08X > 0x%08X%08X\n", + cpu, (u32)(now>>32), (u32)now, (u32)(timeout>>32),(u32)timeout); return 0; /* timeout value in the past */ } @@ -694,11 +694,11 @@ int reprogram_ac_timer(s_time_t timeout) apic_tmict = (((u64)bus_scale) * expire)>>18; if (apic_tmict >= 0xffffffff) { - printk("APICT[%02d] Timeout value too large\n", cpu); + Dprintk("APICT[%02d] Timeout value too large\n", cpu); apic_tmict = 0xffffffff; } if (apic_tmict == 0) { - printk("APICT[%02d] timeout value too small\n", cpu); + Dprintk("APICT[%02d] timeout value too small\n", cpu); return 0; } @@ -706,8 +706,6 @@ int reprogram_ac_timer(s_time_t timeout) /* Program the timer. */ apic_write(APIC_TMICT, (unsigned long)apic_tmict); - TRC(printk("APICT[%02d] reprog(): expire=%lld %u\n", - cpu, expire, apic_tmict)); return 1; } diff --git a/xen/drivers/ide/ide-disk.c b/xen/drivers/ide/ide-disk.c index eb4a972b01..9611322ec5 100644 --- a/xen/drivers/ide/ide-disk.c +++ b/xen/drivers/ide/ide-disk.c @@ -1399,7 +1399,9 @@ static void idedisk_setup (ide_drive_t *drive) #ifdef CONFIG_BLK_DEV_IDEDMA if (drive->using_dma) (void) HWIF(drive)->dmaproc(ide_dma_verbose, drive); + else #endif /* CONFIG_BLK_DEV_IDEDMA */ + printk(" PIO (slow!)"); printk("\n"); drive->mult_count = 0; |