diff options
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 6f1be573a5e6..80c19ee81e95 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
| @@ -768,10 +768,10 @@ struct wait_page_key { | |||
| 768 | struct wait_page_queue { | 768 | struct wait_page_queue { |
| 769 | struct page *page; | 769 | struct page *page; |
| 770 | int bit_nr; | 770 | int bit_nr; |
| 771 | wait_queue_t wait; | 771 | wait_queue_entry_t wait; |
| 772 | }; | 772 | }; |
| 773 | 773 | ||
| 774 | static int wake_page_function(wait_queue_t *wait, unsigned mode, int sync, void *arg) | 774 | static int wake_page_function(wait_queue_entry_t *wait, unsigned mode, int sync, void *arg) |
| 775 | { | 775 | { |
| 776 | struct wait_page_key *key = arg; | 776 | struct wait_page_key *key = arg; |
| 777 | struct wait_page_queue *wait_page | 777 | struct wait_page_queue *wait_page |
| @@ -834,7 +834,7 @@ static inline int wait_on_page_bit_common(wait_queue_head_t *q, | |||
| 834 | struct page *page, int bit_nr, int state, bool lock) | 834 | struct page *page, int bit_nr, int state, bool lock) |
| 835 | { | 835 | { |
| 836 | struct wait_page_queue wait_page; | 836 | struct wait_page_queue wait_page; |
| 837 | wait_queue_t *wait = &wait_page.wait; | 837 | wait_queue_entry_t *wait = &wait_page.wait; |
| 838 | int ret = 0; | 838 | int ret = 0; |
| 839 | 839 | ||
| 840 | init_wait(wait); | 840 | init_wait(wait); |
| @@ -847,7 +847,7 @@ static inline int wait_on_page_bit_common(wait_queue_head_t *q, | |||
| 847 | 847 | ||
| 848 | if (likely(list_empty(&wait->task_list))) { | 848 | if (likely(list_empty(&wait->task_list))) { |
| 849 | if (lock) | 849 | if (lock) |
| 850 | __add_wait_queue_tail_exclusive(q, wait); | 850 | __add_wait_queue_entry_tail_exclusive(q, wait); |
| 851 | else | 851 | else |
| 852 | __add_wait_queue(q, wait); | 852 | __add_wait_queue(q, wait); |
| 853 | SetPageWaiters(page); | 853 | SetPageWaiters(page); |
| @@ -907,7 +907,7 @@ int wait_on_page_bit_killable(struct page *page, int bit_nr) | |||
| 907 | * | 907 | * |
| 908 | * Add an arbitrary @waiter to the wait queue for the nominated @page. | 908 | * Add an arbitrary @waiter to the wait queue for the nominated @page. |
| 909 | */ | 909 | */ |
| 910 | void add_page_wait_queue(struct page *page, wait_queue_t *waiter) | 910 | void add_page_wait_queue(struct page *page, wait_queue_entry_t *waiter) |
| 911 | { | 911 | { |
| 912 | wait_queue_head_t *q = page_waitqueue(page); | 912 | wait_queue_head_t *q = page_waitqueue(page); |
| 913 | unsigned long flags; | 913 | unsigned long flags; |
