[mmotm] smp.c: fix build error

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: LKML <linux-kernel@...>, Andrew Morton <akpm@...>, Eduard - Gabriel Munteanu <eduard.munteanu@...>, Tom Zanussi <tzanussi@...>, Jens Axboe <jens.axboe@...>
Cc: <kosaki.motohiro@...>
Date: Saturday, July 12, 2008 - 7:11 am

Against: mmotm
Patch name: full-conversion-to-early_initcall-interface-remove-old-interface-fix-fix.patch
Applies after: full-conversion-to-early_initcall-interface-remove-old-interface-fix.patch

--------------------------------

Now, init_call_single_data() is static function.
then redundant declaration cause build error as below.

     kernel/smp.c:36: error: static declaration of ‘init_call_single_data’ follows non-static declaration
     include/linux/smp.h:77: error: previous declaration of ‘init_call_single_data’ was here
     kernel/smp.c:47: warning: initialization from incompatible pointer type
     make[1]: *** [kernel/smp.o] error 1

Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
CC: Andrew Morton <akpm@linux-foundation.org>
Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Cc: Tom Zanussi <tzanussi@gmail.com>
Cc: Jens Axboe <jens.axboe@oracle.com>

---
 include/linux/smp.h |    5 -----
 1 file changed, 5 deletions(-)

Index: b/include/linux/smp.h
===================================================================
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -74,15 +74,10 @@ void __smp_call_function_single(int cpui
 #ifdef CONFIG_USE_GENERIC_SMP_HELPERS
 void generic_smp_call_function_single_interrupt(void);
 void generic_smp_call_function_interrupt(void);
-void init_call_single_data(void);
 void ipi_call_lock(void);
 void ipi_call_unlock(void);
 void ipi_call_lock_irq(void);
 void ipi_call_unlock_irq(void);
-#else
-static inline void init_call_single_data(void)
-{
-}
 #endif
 
 /*




--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[mmotm] smp.c: fix build error , KOSAKI Motohiro, (Sat Jul 12, 7:11 am)
Re: [mmotm] smp.c: fix build error, Eduard - Gabriel Munteanu..., (Sat Jul 12, 12:45 pm)