projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1f40a8b
c517d83
)
Merge tag 'v4.0-rc1' into x86/mm, to refresh the tree
author
Ingo Molnar
<mingo@kernel.org>
Tue, 24 Feb 2015 14:55:28 +0000
(15:55 +0100)
committer
Ingo Molnar
<mingo@kernel.org>
Tue, 24 Feb 2015 14:55:28 +0000
(15:55 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1
2
arch/x86/mm/pgtable.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/x86/mm/pgtable.c
index d223e1fe1dd2b47173c9b9a675cc856b7fe0cd70,7b22adaad4f1379a1195aec23b38a28a8db83f5c..5a7e5252c878bdcd2e45a11257adc15763cdea5f
---
1
/
arch/x86/mm/pgtable.c
---
2
/
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;
}