diff options
Diffstat (limited to 'kernel/wait.c')
-rw-r--r-- | kernel/wait.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kernel/wait.c b/kernel/wait.c index f9876888a569..c275c56cf2d3 100644 --- a/kernel/wait.c +++ b/kernel/wait.c | |||
@@ -18,7 +18,7 @@ void init_waitqueue_head(wait_queue_head_t *q) | |||
18 | 18 | ||
19 | EXPORT_SYMBOL(init_waitqueue_head); | 19 | EXPORT_SYMBOL(init_waitqueue_head); |
20 | 20 | ||
21 | void fastcall add_wait_queue(wait_queue_head_t *q, wait_queue_t *wait) | 21 | void add_wait_queue(wait_queue_head_t *q, wait_queue_t *wait) |
22 | { | 22 | { |
23 | unsigned long flags; | 23 | unsigned long flags; |
24 | 24 | ||
@@ -29,7 +29,7 @@ void fastcall add_wait_queue(wait_queue_head_t *q, wait_queue_t *wait) | |||
29 | } | 29 | } |
30 | EXPORT_SYMBOL(add_wait_queue); | 30 | EXPORT_SYMBOL(add_wait_queue); |
31 | 31 | ||
32 | void fastcall add_wait_queue_exclusive(wait_queue_head_t *q, wait_queue_t *wait) | 32 | void add_wait_queue_exclusive(wait_queue_head_t *q, wait_queue_t *wait) |
33 | { | 33 | { |
34 | unsigned long flags; | 34 | unsigned long flags; |
35 | 35 | ||
@@ -40,7 +40,7 @@ void fastcall add_wait_queue_exclusive(wait_queue_head_t *q, wait_queue_t *wait) | |||
40 | } | 40 | } |
41 | EXPORT_SYMBOL(add_wait_queue_exclusive); | 41 | EXPORT_SYMBOL(add_wait_queue_exclusive); |
42 | 42 | ||
43 | void fastcall remove_wait_queue(wait_queue_head_t *q, wait_queue_t *wait) | 43 | void remove_wait_queue(wait_queue_head_t *q, wait_queue_t *wait) |
44 | { | 44 | { |
45 | unsigned long flags; | 45 | unsigned long flags; |
46 | 46 | ||
@@ -63,7 +63,7 @@ EXPORT_SYMBOL(remove_wait_queue); | |||
63 | * stops them from bleeding out - it would still allow subsequent | 63 | * stops them from bleeding out - it would still allow subsequent |
64 | * loads to move into the critical region). | 64 | * loads to move into the critical region). |
65 | */ | 65 | */ |
66 | void fastcall | 66 | void |
67 | prepare_to_wait(wait_queue_head_t *q, wait_queue_t *wait, int state) | 67 | prepare_to_wait(wait_queue_head_t *q, wait_queue_t *wait, int state) |
68 | { | 68 | { |
69 | unsigned long flags; | 69 | unsigned long flags; |
@@ -82,7 +82,7 @@ prepare_to_wait(wait_queue_head_t *q, wait_queue_t *wait, int state) | |||
82 | } | 82 | } |
83 | EXPORT_SYMBOL(prepare_to_wait); | 83 | EXPORT_SYMBOL(prepare_to_wait); |
84 | 84 | ||
85 | void fastcall | 85 | void |
86 | prepare_to_wait_exclusive(wait_queue_head_t *q, wait_queue_t *wait, int state) | 86 | prepare_to_wait_exclusive(wait_queue_head_t *q, wait_queue_t *wait, int state) |
87 | { | 87 | { |
88 | unsigned long flags; | 88 | unsigned long flags; |
@@ -101,7 +101,7 @@ prepare_to_wait_exclusive(wait_queue_head_t *q, wait_queue_t *wait, int state) | |||
101 | } | 101 | } |
102 | EXPORT_SYMBOL(prepare_to_wait_exclusive); | 102 | EXPORT_SYMBOL(prepare_to_wait_exclusive); |
103 | 103 | ||
104 | void fastcall finish_wait(wait_queue_head_t *q, wait_queue_t *wait) | 104 | void finish_wait(wait_queue_head_t *q, wait_queue_t *wait) |
105 | { | 105 | { |
106 | unsigned long flags; | 106 | unsigned long flags; |
107 | 107 | ||
@@ -157,7 +157,7 @@ EXPORT_SYMBOL(wake_bit_function); | |||
157 | * waiting, the actions of __wait_on_bit() and __wait_on_bit_lock() are | 157 | * waiting, the actions of __wait_on_bit() and __wait_on_bit_lock() are |
158 | * permitted return codes. Nonzero return codes halt waiting and return. | 158 | * permitted return codes. Nonzero return codes halt waiting and return. |
159 | */ | 159 | */ |
160 | int __sched fastcall | 160 | int __sched |
161 | __wait_on_bit(wait_queue_head_t *wq, struct wait_bit_queue *q, | 161 | __wait_on_bit(wait_queue_head_t *wq, struct wait_bit_queue *q, |
162 | int (*action)(void *), unsigned mode) | 162 | int (*action)(void *), unsigned mode) |
163 | { | 163 | { |
@@ -173,7 +173,7 @@ __wait_on_bit(wait_queue_head_t *wq, struct wait_bit_queue *q, | |||
173 | } | 173 | } |
174 | EXPORT_SYMBOL(__wait_on_bit); | 174 | EXPORT_SYMBOL(__wait_on_bit); |
175 | 175 | ||
176 | int __sched fastcall out_of_line_wait_on_bit(void *word, int bit, | 176 | int __sched out_of_line_wait_on_bit(void *word, int bit, |
177 | int (*action)(void *), unsigned mode) | 177 | int (*action)(void *), unsigned mode) |
178 | { | 178 | { |
179 | wait_queue_head_t *wq = bit_waitqueue(word, bit); | 179 | wait_queue_head_t *wq = bit_waitqueue(word, bit); |
@@ -183,7 +183,7 @@ int __sched fastcall out_of_line_wait_on_bit(void *word, int bit, | |||
183 | } | 183 | } |
184 | EXPORT_SYMBOL(out_of_line_wait_on_bit); | 184 | EXPORT_SYMBOL(out_of_line_wait_on_bit); |
185 | 185 | ||
186 | int __sched fastcall | 186 | int __sched |
187 | __wait_on_bit_lock(wait_queue_head_t *wq, struct wait_bit_queue *q, | 187 | __wait_on_bit_lock(wait_queue_head_t *wq, struct wait_bit_queue *q, |
188 | int (*action)(void *), unsigned mode) | 188 | int (*action)(void *), unsigned mode) |
189 | { | 189 | { |
@@ -201,7 +201,7 @@ __wait_on_bit_lock(wait_queue_head_t *wq, struct wait_bit_queue *q, | |||
201 | } | 201 | } |
202 | EXPORT_SYMBOL(__wait_on_bit_lock); | 202 | EXPORT_SYMBOL(__wait_on_bit_lock); |
203 | 203 | ||
204 | int __sched fastcall out_of_line_wait_on_bit_lock(void *word, int bit, | 204 | int __sched out_of_line_wait_on_bit_lock(void *word, int bit, |
205 | int (*action)(void *), unsigned mode) | 205 | int (*action)(void *), unsigned mode) |
206 | { | 206 | { |
207 | wait_queue_head_t *wq = bit_waitqueue(word, bit); | 207 | wait_queue_head_t *wq = bit_waitqueue(word, bit); |
@@ -211,7 +211,7 @@ int __sched fastcall out_of_line_wait_on_bit_lock(void *word, int bit, | |||
211 | } | 211 | } |
212 | EXPORT_SYMBOL(out_of_line_wait_on_bit_lock); | 212 | EXPORT_SYMBOL(out_of_line_wait_on_bit_lock); |
213 | 213 | ||
214 | void fastcall __wake_up_bit(wait_queue_head_t *wq, void *word, int bit) | 214 | void __wake_up_bit(wait_queue_head_t *wq, void *word, int bit) |
215 | { | 215 | { |
216 | struct wait_bit_key key = __WAIT_BIT_KEY_INITIALIZER(word, bit); | 216 | struct wait_bit_key key = __WAIT_BIT_KEY_INITIALIZER(word, bit); |
217 | if (waitqueue_active(wq)) | 217 | if (waitqueue_active(wq)) |
@@ -236,13 +236,13 @@ EXPORT_SYMBOL(__wake_up_bit); | |||
236 | * may need to use a less regular barrier, such fs/inode.c's smp_mb(), | 236 | * may need to use a less regular barrier, such fs/inode.c's smp_mb(), |
237 | * because spin_unlock() does not guarantee a memory barrier. | 237 | * because spin_unlock() does not guarantee a memory barrier. |
238 | */ | 238 | */ |
239 | void fastcall wake_up_bit(void *word, int bit) | 239 | void wake_up_bit(void *word, int bit) |
240 | { | 240 | { |
241 | __wake_up_bit(bit_waitqueue(word, bit), word, bit); | 241 | __wake_up_bit(bit_waitqueue(word, bit), word, bit); |
242 | } | 242 | } |
243 | EXPORT_SYMBOL(wake_up_bit); | 243 | EXPORT_SYMBOL(wake_up_bit); |
244 | 244 | ||
245 | fastcall wait_queue_head_t *bit_waitqueue(void *word, int bit) | 245 | wait_queue_head_t *bit_waitqueue(void *word, int bit) |
246 | { | 246 | { |
247 | const int shift = BITS_PER_LONG == 32 ? 5 : 6; | 247 | const int shift = BITS_PER_LONG == 32 ? 5 : 6; |
248 | const struct zone *zone = page_zone(virt_to_page(word)); | 248 | const struct zone *zone = page_zone(virt_to_page(word)); |