diff options
| author | Mohamad Ayyash <mkayyash@google.com> | 2015-06-08 12:25:56 -0700 |
|---|---|---|
| committer | Mohamad Ayyash <mkayyash@google.com> | 2015-06-08 12:25:56 -0700 |
| commit | d0aa434010de35cbb9cb7953b1cc15e2eaf5f6fe (patch) | |
| tree | 44c9a91c75fc080dd70d2e070246a938f54a3827 /kernel | |
| parent | 5862c50d1970886b5b5a57b5b52ecfd6feb95ebd (diff) | |
| parent | 607437e0a933b64333a627484c277b68a080f385 (diff) | |
| download | edison-v3.10-d0aa434010de35cbb9cb7953b1cc15e2eaf5f6fe.tar.gz | |
Merge remote-tracking branch 'ext4-3.19/for-android-3.10-common' into android-3.10
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/wait.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel/wait.c b/kernel/wait.c index 6698e0c04ea..bca170ef386 100644 --- a/kernel/wait.c +++ b/kernel/wait.c @@ -287,3 +287,12 @@ wait_queue_head_t *bit_waitqueue(void *word, int bit) return &zone->wait_table[hash_long(val, zone->wait_table_bits)]; } EXPORT_SYMBOL(bit_waitqueue); + +__sched int bit_wait_io(void *word) +{ + if (signal_pending_state(current->state, current)) + return 1; + io_schedule(); + return 0; +} +EXPORT_SYMBOL(bit_wait_io); |