From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 24 Feb 2015 14:55:28 +0000 (+0100)
Subject: Merge tag 'v4.0-rc1' into x86/mm, to refresh the tree
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~12559^2~12
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a1fb6696c662920f695c97591d759391aca8a1ad;p=mirror_ubuntu-focal-kernel.git

Merge tag 'v4.0-rc1' into x86/mm, to refresh the tree

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

a1fb6696c662920f695c97591d759391aca8a1ad
diff --cc arch/x86/mm/pgtable.c
index d223e1fe1dd2,7b22adaad4f1..5a7e5252c878
--- a/arch/x86/mm/pgtable.c
+++ b/arch/x86/mm/pgtable.c
@@@ -379,9 -308,9 +383,9 @@@ pgd_t *pgd_alloc(struct mm_struct *mm
  	return pgd;
  
  out_free_pmds:
- 	free_pmds(pmds);
+ 	free_pmds(mm, pmds);
  out_free_pgd:
 -	free_page((unsigned long)pgd);
 +	_pgd_free(pgd);
  out:
  	return NULL;
  }