Linus,
This patch just syncs up the cyclone-timer code w/ Greg's changes from
this morning.
Please apply.
thanks
-john
diff -Nru a/arch/i386/kernel/timers/timer_cyclone.c b/arch/i386/kernel/timers/timer_cyclone.c
--- a/arch/i386/kernel/timers/timer_cyclone.c Thu Oct 10 18:07:14 2002
+++ b/arch/i386/kernel/timers/timer_cyclone.c Thu Oct 10 18:07:14 2002
@@ -81,7 +81,7 @@
/*make sure we're on a summit box*/
/*XXX need to use proper summit hooks! such as xapic -john*/
- if(!use_cyclone) return 0;
+ if(!use_cyclone) return -ENODEV;
printk(KERN_INFO "Summit chipset: Starting Cyclone Counter.\n");
@@ -92,12 +92,12 @@
reg = (u32*)(fix_to_virt(FIX_CYCLONE_TIMER) + offset);
if(!reg){
printk(KERN_ERR "Summit chipset: Could not find valid CBAR register.\n");
- return 0;
+ return -ENODEV;
}
base = *reg;
if(!base){
printk(KERN_ERR "Summit chipset: Could not find valid CBAR value.\n");
- return 0;
+ return -ENODEV;
}
/* setup PMCC */
@@ -107,7 +107,7 @@
reg = (u32*)(fix_to_virt(FIX_CYCLONE_TIMER) + offset);
if(!reg){
printk(KERN_ERR "Summit chipset: Could not find valid PMCC register.\n");
- return 0;
+ return -ENODEV;
}
reg[0] = 0x00000001;
@@ -118,7 +118,7 @@
reg = (u32*)(fix_to_virt(FIX_CYCLONE_TIMER) + offset);
if(!reg){
printk(KERN_ERR "Summit chipset: Could not find valid MPCS register.\n");
- return 0;
+ return -ENODEV;
}
reg[0] = 0x00000001;
@@ -129,7 +129,7 @@
cyclone_timer = (u32*)(fix_to_virt(FIX_CYCLONE_TIMER) + offset);
if(!cyclone_timer){
printk(KERN_ERR "Summit chipset: Could not find valid MPMC register.\n");
- return 0;
+ return -ENODEV;
}
/*quick test to make sure its ticking*/
@@ -140,12 +140,12 @@
if(cyclone_timer[0] == old){
printk(KERN_ERR "Summit chipset: Counter not counting! DISABLED\n");
cyclone_timer = 0;
- return 0;
+ return -ENODEV;
}
}
/* Everything looks good! */
- return 1;
+ return 0;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Tue Oct 15 2002 - 22:00:40 EST