--- linux-2.4.0-prerelease-ac4/include/linux/delay.h Mon Jan 1 23:30:23 2001
+++ test/linux-merge20-2.4.0-prerelease-ac4/include/linux/delay.h Wed Jan 3 16:45:28 2001
@@ -13,7 +13,7 @@
/*
* Using udelay() for intervals greater than a few milliseconds can
- * risk overflow for high loops_per_sec (high bogomips) machines. The
+ * risk overflow for high loops_per_jiffy (high bogomips) machines. The
* mdelay() provides a wrapper to prevent this. For delays greater
* than MAX_UDELAY_MS milliseconds, the wrapper is used. Architecture
* specific values can be defined in asm-???/delay.h as an override.
--- linux-2.4.0-prerelease-ac4/arch/s390/kernel/setup.c Wed Jan 3 14:23:49 2001
+++ test/linux-merge20-2.4.0-prerelease-ac4/arch/s390/kernel/setup.c Wed Jan 3 16:46:17 2001
@@ -369,7 +369,7 @@
"# processors : %i\n"
"bogomips per cpu: %lu.%02lu\n",
smp_num_cpus, loops_per_jiffy/(500000/HZ),
- (loops_per_sec/(5000/HZ))%100);
+ (loops_per_jiffy/(5000/HZ))%100);
for (i = 0; i < smp_num_cpus; i++) {
cpuinfo = &safe_get_cpu_lowcore(i).cpu_data;
p += sprintf(p,"processor %i: "
Gr{oetje,eeting}s,
Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.orgIn personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org Please read the FAQ at http://www.tux.org/lkml/