Merge USB 4.20-rc8 mergepoint into usb-next

We need the USB changes in here for additional patches to be able to
apply cleanly.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 705a3e9cc910..a80832487981 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1248,10 +1248,11 @@ void free_huge_page(struct page *page)
                 (struct hugepage_subpool *)page_private(page);
         bool restore_reserve;
 
-        set_page_private(page, 0);
-        page->mapping = NULL;
         VM_BUG_ON_PAGE(page_count(page), page);
         VM_BUG_ON_PAGE(page_mapcount(page), page);
+
+        set_page_private(page, 0);
+        page->mapping = NULL;
         restore_reserve = PagePrivate(page);
         ClearPagePrivate(page);