Messages in this thread Patch in this message | | | Date | Mon, 22 Oct 2007 14:30:41 +0200 | From | Ingo Molnar <> | Subject | Re: [uml-devel] User Mode Linux still doesn't build in 2.6.23-final. |
| |
* WANG Cong <xiyou.wangcong@gmail.com> wrote:
> On Mon, Oct 22, 2007 at 12:36:00PM +0100, Al Viro wrote: > >On Mon, Oct 22, 2007 at 03:48:23PM +0800, WANG Cong wrote: > >> I just followed what Sam told me, errors are much fewer this time, > >> but still exist. Error messages are: > >> > >> CC arch/um/kernel/syscall.o > >> CC arch/um/kernel/sysrq.o > >> arch/um/kernel/sysrq.c: In function ???show_stack???: > >> arch/um/kernel/sysrq.c:63: error: ???UESP??? undeclared (first use in this function) > >> arch/um/kernel/sysrq.c:63: error: (Each undeclared identifier is reported only once > >> arch/um/kernel/sysrq.c:63: error: for each function it appears in.) > >> make[1]: *** [arch/um/kernel/sysrq.o] Error 1 > >> make: *** [arch/um/kernel] Error 2 > >> > >> Or I missed something again? > >> > >> And I use `make defconfig ARCH=um' to generate .config, my tree > >> is 2.6.23-git16 (Al, is this OK?). > > > >Now apply the patch upthread, it should've fixed that one (and yes, you > >are down to the stuff this patch is supposed to fix - and does so here). > > Yes, this one is fixed. Thanks for your patch. > > But another one comes out. ;( > > CC kernel/sched.o > kernel/sched.c:3902: error: conflicting types for ‘wait_for_completion_interruptible’ > include/linux/completion.h:46: error: previous declaration of ‘wait_for_completion_interruptible’ was here > kernel/sched.c:3908: error: conflicting types for ‘wait_for_completion_interruptible’ > include/linux/completion.h:46: error: previous declaration of ‘wait_for_completion_interruptible’ was here > make[1]: *** [kernel/sched.o] Error 1 > make: *** [kernel] Error 2
does the patch below ontop of latest -git help?
Ingo
----------------> Subject: sched: fix fastcall mismatch in completion APIs From: Ingo Molnar <mingo@elte.hu>
Jeff Dike noticed that wait_for_completion_interruptible()'s prototype had a mismatched fastcall.
Fix this by removing the fastcall attributes from all the completion APIs.
Found-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> --- include/linux/completion.h | 16 ++++++++-------- kernel/sched.c | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-)
Index: linux/include/linux/completion.h =================================================================== --- linux.orig/include/linux/completion.h +++ linux/include/linux/completion.h @@ -42,15 +42,15 @@ static inline void init_completion(struc init_waitqueue_head(&x->wait); } -extern void FASTCALL(wait_for_completion(struct completion *)); -extern int FASTCALL(wait_for_completion_interruptible(struct completion *x)); -extern unsigned long FASTCALL(wait_for_completion_timeout(struct completion *x, - unsigned long timeout)); -extern unsigned long FASTCALL(wait_for_completion_interruptible_timeout( - struct completion *x, unsigned long timeout)); +extern void wait_for_completion(struct completion *); +extern int wait_for_completion_interruptible(struct completion *x); +extern unsigned long wait_for_completion_timeout(struct completion *x, + unsigned long timeout); +extern unsigned long wait_for_completion_interruptible_timeout( + struct completion *x, unsigned long timeout); -extern void FASTCALL(complete(struct completion *)); -extern void FASTCALL(complete_all(struct completion *)); +extern void complete(struct completion *); +extern void complete_all(struct completion *); #define INIT_COMPLETION(x) ((x).done = 0) Index: linux/kernel/sched.c =================================================================== --- linux.orig/kernel/sched.c +++ linux/kernel/sched.c @@ -3821,7 +3821,7 @@ __wake_up_sync(wait_queue_head_t *q, uns } EXPORT_SYMBOL_GPL(__wake_up_sync); /* For internal use only */ -void fastcall complete(struct completion *x) +void complete(struct completion *x) { unsigned long flags; @@ -3833,7 +3833,7 @@ void fastcall complete(struct completion } EXPORT_SYMBOL(complete); -void fastcall complete_all(struct completion *x) +void complete_all(struct completion *x) { unsigned long flags; @@ -3885,13 +3885,13 @@ wait_for_common(struct completion *x, lo return timeout; } -void fastcall __sched wait_for_completion(struct completion *x) +void __sched wait_for_completion(struct completion *x) { wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_UNINTERRUPTIBLE); } EXPORT_SYMBOL(wait_for_completion); -unsigned long fastcall __sched +unsigned long __sched wait_for_completion_timeout(struct completion *x, unsigned long timeout) { return wait_for_common(x, timeout, TASK_UNINTERRUPTIBLE); @@ -3907,7 +3907,7 @@ int __sched wait_for_completion_interrup } EXPORT_SYMBOL(wait_for_completion_interruptible); -unsigned long fastcall __sched +unsigned long __sched wait_for_completion_interruptible_timeout(struct completion *x, unsigned long timeout) { - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |