diff options
| author | David Howells <dhowells@redhat.com> | 2005-01-04 05:20:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-04 05:20:24 -0800 |
| commit | 4236031c5f7976363e177aace4e15a2859b297e9 (patch) | |
| tree | 5b4da1a486fa9056366bdb352f7894134fe70bc6 /include | |
| parent | 2c71699cb3163591ba79e80fe2219bdc5087c709 (diff) | |
[PATCH] FRV: Make calibrate_delay() optional
The attached patch makes calibrate_delay() optional. In this architecture, it's
a waste of time since we can predict exactly what it's going to come up with
just by looking at the CPU's hardware clock registers. Thus far, we haven't
seen a board with any clock not dependent on the CPU's clock.
Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-m32r/smp.h | 1 | ||||
| -rw-r--r-- | include/asm-x86_64/proto.h | 1 | ||||
| -rw-r--r-- | include/linux/delay.h | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-m32r/smp.h b/include/asm-m32r/smp.h index 7857c8b6111e..8cd4d0da4be1 100644 --- a/include/asm-m32r/smp.h +++ b/include/asm-m32r/smp.h @@ -92,7 +92,6 @@ static __inline__ unsigned int num_booting_cpus(void) } extern void smp_send_timer(void); -extern void calibrate_delay(void); extern unsigned long send_IPI_mask_phys(cpumask_t, int, int); #endif /* not __ASSEMBLY__ */ diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h index b51da7ca61c0..afb9b52b879c 100644 --- a/include/asm-x86_64/proto.h +++ b/include/asm-x86_64/proto.h @@ -25,7 +25,6 @@ extern void ia32_syscall(void); extern void ia32_cstar_target(void); extern void ia32_sysenter_target(void); -extern void calibrate_delay(void); extern void cpu_idle(void); extern void config_acpi_tables(void); extern void ia32_syscall(void); diff --git a/include/linux/delay.h b/include/linux/delay.h index 5c43c336c849..acb74865b973 100644 --- a/include/linux/delay.h +++ b/include/linux/delay.h @@ -38,6 +38,7 @@ extern unsigned long loops_per_jiffy; #define ndelay(x) udelay(((x)+999)/1000) #endif +void calibrate_delay(void); void msleep(unsigned int msecs); unsigned long msleep_interruptible(unsigned int msecs); |