Re: [PATCH 10/14] FRV: Make calibrate_delay() optional

[Andrew Morton]

init/main.c: In function `start_kernel':
init/main.c:494: warning: implicit declaration of function `calibrate_delay'

Move the calibrate_delay() prototype into linux/delay.h

Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 25-akpm/include/asm-frv/delay.h    |    1 -
 25-akpm/include/asm-m32r/smp.h     |    1 -
 25-akpm/include/asm-x86_64/proto.h |    1 -
 25-akpm/include/linux/delay.h      |    1 +
 4 files changed, 1 insertion(+), 3 deletions(-)

diff -puN include/linux/delay.h~frv-make-calibrate_delay-optional-warning-fix include/linux/delay.h
--- 25/include/linux/delay.h~frv-make-calibrate_delay-optional-warning-fix	2004-11-01 23:20:40.736445936 -0800
+++ 25-akpm/include/linux/delay.h	2004-11-01 23:21:09.070138560 -0800
@@ -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);
 
diff -puN include/asm-m32r/smp.h~frv-make-calibrate_delay-optional-warning-fix include/asm-m32r/smp.h
--- 25/include/asm-m32r/smp.h~frv-make-calibrate_delay-optional-warning-fix	2004-11-01 23:20:40.752443504 -0800
+++ 25-akpm/include/asm-m32r/smp.h	2004-11-01 23:20:54.544346816 -0800
@@ -92,7 +92,6 @@ static __inline__ unsigned int num_booti
 }
 
 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 -puN include/asm-x86_64/proto.h~frv-make-calibrate_delay-optional-warning-fix include/asm-x86_64/proto.h
--- 25/include/asm-x86_64/proto.h~frv-make-calibrate_delay-optional-warning-fix	2004-11-01 23:20:40.769440920 -0800
+++ 25-akpm/include/asm-x86_64/proto.h	2004-11-01 23:21:13.197511104 -0800
@@ -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 -puN include/asm-frv/delay.h~frv-make-calibrate_delay-optional-warning-fix include/asm-frv/delay.h
--- 25/include/asm-frv/delay.h~frv-make-calibrate_delay-optional-warning-fix	2004-11-01 23:20:40.785438488 -0800
+++ 25-akpm/include/asm-frv/delay.h	2004-11-01 23:21:19.580540736 -0800
@@ -18,7 +18,6 @@
  * delay loop - runs at __core_clock_speed_HZ / 2 [there are 2 insns in the loop]
  */
 extern unsigned long __delay_loops_MHz;
-extern void calibrate_delay(void);
 
 static inline void __delay(unsigned long loops)
 {
_

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/