Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Will Deacon:
"Just one small fix here, preventing a VM_WARN_ON when a !present
PMD/PUD is "freed" as part of a huge ioremap() operation.
The correct behaviour is to skip the free silently in this case, which
is a little weird (the function is a bit of a misnomer), but it
follows the x86 implementation"
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: fix erroneous warnings in page freeing functions
+6
-4
+6
-4
arch/arm64/mm/mmu.c
+6
-4
arch/arm64/mm/mmu.c
···
985
985
986
986
pmd = READ_ONCE(*pmdp);
987
987
988
-
/* No-op for empty entry and WARN_ON for valid entry */
989
-
if (!pmd_present(pmd) || !pmd_table(pmd)) {
988
+
if (!pmd_present(pmd))
989
+
return 1;
990
+
if (!pmd_table(pmd)) {
990
991
VM_WARN_ON(!pmd_table(pmd));
991
992
return 1;
992
993
}
···
1008
1007
1009
1008
pud = READ_ONCE(*pudp);
1010
1009
1011
-
/* No-op for empty entry and WARN_ON for valid entry */
1012
-
if (!pud_present(pud) || !pud_table(pud)) {
1010
+
if (!pud_present(pud))
1011
+
return 1;
1012
+
if (!pud_table(pud)) {
1013
1013
VM_WARN_ON(!pud_table(pud));
1014
1014
return 1;
1015
1015
}