From: Andrew Morton <akpm@osdl.org>
To: eric.valette@free.fr
Cc: linux-kernel@vger.kernel.org
Subject: Re: 2.6.9-rc1-mm2 : compilation error in kernel/wait.c
Date: Tue, 31 Aug 2004 01:13:10 -0700 [thread overview]
Message-ID: <20040831011310.27e4c221.akpm@osdl.org> (raw)
In-Reply-To: <41343136.6080208@free.fr>
Eric Valette <eric.valette@free.fr> 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;
_
prev parent reply other threads:[~2004-08-31 8:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-08-31 8:05 Eric Valette
2004-08-31 8:09 ` William Lee Irwin III
2004-08-31 8:14 ` William Lee Irwin III
2004-08-31 8:44 ` wait_on_bit_lock() must test_and_set_bit(), not test_bit() William Lee Irwin III
2004-08-31 21:03 ` [1/2] move wait ops' contention case completely out of line William Lee Irwin III
2004-08-31 21:05 ` [2/2] reduce number of parameters to __wait_on_bit() and __wait_on_bit_lock() William Lee Irwin III
2004-08-31 21:12 ` [3/2] document wake_up_bit()'s requirement for preceding memory barriers William Lee Irwin III
2004-08-31 8:13 ` Andrew Morton [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040831011310.27e4c221.akpm@osdl.org \
--to=akpm@osdl.org \
--cc=eric.valette@free.fr \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®