debuggers.hg

view xen/arch/ia64/patch/linux-2.6.11/wait.h @ 4619:5b9e241131fb

bitkeeper revision 1.1329 (42661815u5WPq8d5f4_axi2xWheybA)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xeno-unstable-ia64.bk
author kaf24@firebug.cl.cam.ac.uk
date Wed Apr 20 08:51:33 2005 +0000 (2005-04-20)
parents 58efb3448933
children
line source
1 wait.h | 6 ++++++
2 1 files changed, 6 insertions(+)
4 Index: linux-2.6.11/include/linux/wait.h
5 ===================================================================
6 --- linux-2.6.11.orig/include/linux/wait.h 2005-03-02 01:38:10.000000000 -0600
7 +++ linux-2.6.11/include/linux/wait.h 2005-03-19 15:00:23.691156973 -0600
8 @@ -136,7 +136,11 @@ static inline void __remove_wait_queue(w
9 list_del(&old->task_list);
10 }
12 +#ifdef XEN
13 +void FASTCALL(__wake_up(struct task_struct *p));
14 +#else
15 void FASTCALL(__wake_up(wait_queue_head_t *q, unsigned int mode, int nr, void *key));
16 +#endif
17 extern void FASTCALL(__wake_up_locked(wait_queue_head_t *q, unsigned int mode));
18 extern void FASTCALL(__wake_up_sync(wait_queue_head_t *q, unsigned int mode, int nr));
19 void FASTCALL(__wake_up_bit(wait_queue_head_t *, void *, int));
20 @@ -147,6 +151,7 @@ int FASTCALL(out_of_line_wait_on_bit(voi
21 int FASTCALL(out_of_line_wait_on_bit_lock(void *, int, int (*)(void *), unsigned));
22 wait_queue_head_t *FASTCALL(bit_waitqueue(void *, int));
24 +#ifndef XEN
25 #define wake_up(x) __wake_up(x, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE, 1, NULL)
26 #define wake_up_nr(x, nr) __wake_up(x, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE, nr, NULL)
27 #define wake_up_all(x) __wake_up(x, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE, 0, NULL)
28 @@ -155,6 +160,7 @@ wait_queue_head_t *FASTCALL(bit_waitqueu
29 #define wake_up_interruptible_all(x) __wake_up(x, TASK_INTERRUPTIBLE, 0, NULL)
30 #define wake_up_locked(x) __wake_up_locked((x), TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE)
31 #define wake_up_interruptible_sync(x) __wake_up_sync((x),TASK_INTERRUPTIBLE, 1)
32 +#endif
34 #define __wait_event(wq, condition) \
35 do { \