diff options
| author | kaf24@labyrinth.cl.cam.ac.uk <kaf24@labyrinth.cl.cam.ac.uk> | 2003-02-14 12:59:53 +0000 |
|---|---|---|
| committer | kaf24@labyrinth.cl.cam.ac.uk <kaf24@labyrinth.cl.cam.ac.uk> | 2003-02-14 12:59:53 +0000 |
| commit | d41b5cae0ce035fd496239fb7f625c666f2ec220 (patch) | |
| tree | d1e8913e4db81de3956c37ec8a084d02251a63f1 /xen-2.4.16/drivers | |
| parent | 3b90aa114babd7398b4565a0d8c6736bcb10f38d (diff) | |
| download | xen-d41b5cae0ce035fd496239fb7f625c666f2ec220.tar.gz xen-d41b5cae0ce035fd496239fb7f625c666f2ec220.tar.bz2 xen-d41b5cae0ce035fd496239fb7f625c666f2ec220.zip | |
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.
Diffstat (limited to 'xen-2.4.16/drivers')
| -rw-r--r-- | xen-2.4.16/drivers/ide/ide-xeno.c | 12 | ||||
| -rw-r--r-- | xen-2.4.16/drivers/net/e1000/e1000_osdep.h | 1 |
2 files changed, 5 insertions, 8 deletions
diff --git a/xen-2.4.16/drivers/ide/ide-xeno.c b/xen-2.4.16/drivers/ide/ide-xeno.c index e0ce54feed..d5d4bc2d8a 100644 --- a/xen-2.4.16/drivers/ide/ide-xeno.c +++ b/xen-2.4.16/drivers/ide/ide-xeno.c @@ -8,15 +8,13 @@ void ide_probe_devices (xen_disk_info_t* xdi) { int loop; + unsigned int unit; for (loop = 0; loop < MAX_HWIFS; ++loop) { ide_hwif_t *hwif = &ide_hwifs[loop]; if (hwif->present) { - struct gendisk *gd = hwif->gd; - unsigned int unit; - for (unit = 0; unit < MAX_DRIVES; ++unit) { unsigned long capacity; ide_drive_t *drive = &hwif->drives[unit]; @@ -28,10 +26,10 @@ void ide_probe_devices (xen_disk_info_t* xdi) xdi->count++; printk (KERN_ALERT "IDE-XENO %d\n", xdi->count); - printk (KERN_ALERT " capacity 0x%x\n", capacity); - printk (KERN_ALERT " head 0x%x\n", drive->bios_head); - printk (KERN_ALERT " sector 0x%x\n", drive->bios_sect); - printk (KERN_ALERT " cylinder 0x%x\n", drive->bios_cyl); + printk (KERN_ALERT " capacity 0x%lx\n", capacity); + printk (KERN_ALERT " head 0x%x\n", drive->bios_head); + printk (KERN_ALERT " sector 0x%x\n", drive->bios_sect); + printk (KERN_ALERT " cylinder 0x%x\n", drive->bios_cyl); } } } diff --git a/xen-2.4.16/drivers/net/e1000/e1000_osdep.h b/xen-2.4.16/drivers/net/e1000/e1000_osdep.h index fe3fff2af7..259d8d8c78 100644 --- a/xen-2.4.16/drivers/net/e1000/e1000_osdep.h +++ b/xen-2.4.16/drivers/net/e1000/e1000_osdep.h @@ -44,7 +44,6 @@ #ifndef msec_delay #define msec_delay(x) {\ int s=jiffies+1+((x*HZ)/1000); \ - printk("mdelay(%d) called -- spin\n",x); \ while(jiffies<s); } #if 0 |