Re: 2.6.9-rc1-mm2 : compilation error in kernel/wait.c

[Andrew Morton]

Eric Valette <eric.valette@xxxxxxx> wrote:
>
> kernel/wait.c:156: error: conflicting types for '__wait_on_bit'
>  include/linux/wait.h:143: error: previous declaration of '__wait_on_bit' 
>  was here
>  kernel/wait.c:156: error: conflicting types for '__wait_on_bit'
>  include/linux/wait.h:143: error: previous declaration of '__wait_on_bit' 
>  was here
>  kernel/wait.c:170: error: conflicting types for '__wait_on_bit_lock'
>  include/linux/wait.h:144: error: previous declaration of 
>  '__wait_on_bit_lock' was here
>  kernel/wait.c:170: error: conflicting types for '__wait_on_bit_lock'
>  include/linux/wait.h:144: error: previous declaration of 
>  '__wait_on_bit_lock' was here

Try this:



diff -puN kernel/wait.c~__wait_on_bit-fix kernel/wait.c
--- linux-bix/kernel/wait.c~__wait_on_bit-fix	2004-08-31 01:11:02.279382800 -0700
+++ linux-bix-akpm/kernel/wait.c	2004-08-31 01:12:33.856460968 -0700
@@ -150,9 +150,9 @@ EXPORT_SYMBOL(wake_bit_function);
  * waiting, the actions of __wait_on_bit() and __wait_on_bit_lock() are
  * permitted return codes. Nonzero return codes halt waiting and return.
  */
-int __sched __wait_on_bit(wait_queue_head_t *wq, struct wait_bit_queue *q,
-			void *word,
-			int bit, int (*action)(void *), unsigned mode)
+int __sched fastcall
+__wait_on_bit(wait_queue_head_t *wq, struct wait_bit_queue *q,
+		void *word, int bit, int (*action)(void *), unsigned mode)
 {
 	int ret = 0;
 
@@ -164,9 +164,9 @@ int __sched __wait_on_bit(wait_queue_hea
 }
 EXPORT_SYMBOL(__wait_on_bit);
 
-int __sched __wait_on_bit_lock(wait_queue_head_t *wq, struct wait_bit_queue *q,
-			void *word, int bit,
-			int (*action)(void *), unsigned mode)
+int __sched fastcall
+__wait_on_bit_lock(wait_queue_head_t *wq, struct wait_bit_queue *q,
+		void *word, int bit, int (*action)(void *), unsigned mode)
 {
 	int ret = 0;
 
_

-
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/