summaryrefslogtreecommitdiffstats
path: root/mm/filemap.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-30 06:40:39 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-30 06:40:39 -0400
commitcbfff98a623df8d4e7c02d63d6448220cf0aec7c (patch)
tree1a02766ada2b9be9745d6028f80a801eff5b358a /mm/filemap.c
parentb65fba3d87216bfe6ae9bc77be5eb6eabb6514a4 (diff)
parenta909d3e636995ba7c349e2ca5dbb528154d4ac30 (diff)
downloadlinux-cbfff98a623df8d4e7c02d63d6448220cf0aec7c.tar.bz2
Merge 4.9-rc3 into usb-next
We want the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/filemap.c')
-rw-r--r--mm/filemap.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index 849f459ad078..c7fe2f16503f 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -790,9 +790,7 @@ EXPORT_SYMBOL(__page_cache_alloc);
*/
wait_queue_head_t *page_waitqueue(struct page *page)
{
- const struct zone *zone = page_zone(page);
-
- return &zone->wait_table[hash_ptr(page, zone->wait_table_bits)];
+ return bit_waitqueue(page, 0);
}
EXPORT_SYMBOL(page_waitqueue);