mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
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.
This commit is contained in:
kaf24@labyrinth.cl.cam.ac.uk committed
1 parent
3b90aa114b
commit
d41b5cae0c
6 files changed
+11
-12
No files matched your search
@@ -788,7 +788,7 @@ void __init print_IO_APIC(void)
|
||||
spin_unlock_irqrestore(&ioapic_lock, flags);
|
||||
|
||||
printk("\n");
|
||||
printk(KERN_DEBUG "IO APIC #%d..XXXX....\n", mp_ioapics[apic].mpc_apicid);
|
||||
printk(KERN_DEBUG "IO APIC #%d......\n", mp_ioapics[apic].mpc_apicid);
|
||||
printk(KERN_DEBUG ".... register #00: %08X\n", *(int *)®_00);
|
||||
printk(KERN_DEBUG "....... : physical APIC id: %02X\n", reg_00.ID);
|
||||
if (reg_00.__reserved_1 || reg_00.__reserved_2)
|
||||
@@ -826,6 +826,7 @@ void __init print_IO_APIC(void)
|
||||
UNEXPECTED_IO_APIC();
|
||||
}
|
||||
|
||||
#if 0
|
||||
printk(KERN_DEBUG ".... IRQ redirection table:\n");
|
||||
|
||||
printk(KERN_DEBUG " NR Log Phy Mask Trig IRR Pol"
|
||||
@@ -870,6 +871,7 @@ void __init print_IO_APIC(void)
|
||||
entry = irq_2_pin + entry->next;
|
||||
}
|
||||
printk("\n");
|
||||
#endif
|
||||
}
|
||||
|
||||
printk(KERN_INFO ".................................... done.\n");
|
||||
|
||||
@@ -66,7 +66,7 @@ static act_stats_t act_stats[NR_CPUS];
|
||||
|
||||
/* local prototypes */
|
||||
static int detach_ac_timer(struct ac_timer *timer);
|
||||
static void ac_timer_debug(unsigned long);
|
||||
/*static void ac_timer_debug(unsigned long);*/
|
||||
|
||||
/*
|
||||
* add a timer.
|
||||
|
||||
@@ -580,7 +580,7 @@ int setup_guestos(struct task_struct *p, dom0_newdomain_t *params)
|
||||
unsigned char nfsroot[70];
|
||||
snprintf(nfsroot, 70, opt_nfsroot, dom);
|
||||
snprintf(boot, 200,
|
||||
#if 1
|
||||
#if 0
|
||||
" root=/dev/nfs ip=%s:%s:%s:%s::eth0:off nfsroot=%s",
|
||||
#else
|
||||
" ro root=/dev/xhda7 ip=%s:%s:%s:%s::eth0:off arfle=%s",
|
||||
|
||||
@@ -341,6 +341,6 @@ void schedulers_start(void) {
|
||||
printk("Start schedulers\n");
|
||||
__cli();
|
||||
sched_timer(0);
|
||||
smp_call_function(sched_timer, NULL, 1, 1);
|
||||
smp_call_function((void *)sched_timer, NULL, 1, 1);
|
||||
__sti();
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||