diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-15 15:37:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-15 15:37:46 +0100 |
| commit | cb7edfd4cd47ed50ea618b660ee283a2d99edff2 (patch) | |
| tree | fb2749afac5055798dcf8f0dca77c88e749307da /mm/util.c | |
| parent | USB: core: urb: Use struct_size() in kmalloc() (diff) | |
| parent | Linux 5.0-rc2 (diff) | |
| download | wireguard-linux-cb7edfd4cd47ed50ea618b660ee283a2d99edff2.tar.xz wireguard-linux-cb7edfd4cd47ed50ea618b660ee283a2d99edff2.zip | |
Merge 5.0-rc2 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/util.c')
| -rw-r--r-- | mm/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/util.c b/mm/util.c index 4df23d64aac7..1ea055138043 100644 --- a/mm/util.c +++ b/mm/util.c @@ -478,7 +478,7 @@ bool page_mapped(struct page *page) return true; if (PageHuge(page)) return false; - for (i = 0; i < hpage_nr_pages(page); i++) { + for (i = 0; i < (1 << compound_order(page)); i++) { if (atomic_read(&page[i]._mapcount) >= 0) return true; } |