The patch titled
Subject: arm/mm: fix compiler warning in pmdp_invalidate() (in -next)
has been removed from the -mm tree. Its filename was
mm-convert-p_mknonnuma-and-remaining-page-table-manipulations-fix.patch
This patch was dropped because it was folded into mm-convert-p_mknonnuma-and-remaining-page-table-manipulations.patch
------------------------------------------------------
From: Andre Przywara <andre.przywara@xxxxxxx>
Subject: arm/mm: fix compiler warning in pmdp_invalidate() (in -next)
Commit ff61d185f4e7 ("mm: convert p[te|md]_mknonnuma and remaining
page table manipulations") removed a check in
mm/pgtable-generic.c:pmdp_invalidate(), which leaves the
pmd_mknotpresent macro the only user of the entry variable.
For ARM/LPAE we use a constant 0 without referencing the argument to
mark this condition, so the entry variable is no longer used here:
mm/pgtable-generic.c: In function 'pmdp_invalidate':
mm/pgtable-generic.c:195:8: warning: unused variable 'entry' [-Wunused-variable]
pmd_t entry = *pmdp;
^
Replace the ARM macro implementation with a static inline function to
get rid of this warning.
Signed-off-by: Andre Przywara <andre.przywara@xxxxxxx>
Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
Cc: Mel Gorman <mel@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/arm/include/asm/pgtable-3level.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff -puN arch/arm/include/asm/pgtable-3level.h~mm-convert-p_mknonnuma-and-remaining-page-table-manipulations-fix arch/arm/include/asm/pgtable-3level.h
--- a/arch/arm/include/asm/pgtable-3level.h~mm-convert-p_mknonnuma-and-remaining-page-table-manipulations-fix
+++ a/arch/arm/include/asm/pgtable-3level.h
@@ -257,7 +257,10 @@ PMD_BIT_FUNC(mkyoung, |= PMD_SECT_AF);
#define mk_pmd(page,prot) pfn_pmd(page_to_pfn(page),prot)
/* represent a notpresent pmd by zero, this is used by pmdp_invalidate */
-#define pmd_mknotpresent(pmd) (__pmd(0))
+static inline pmd_t pmd_mknotpresent(pmd_t pmd)
+{
+ return 0;
+}
static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)
{
_
Patches currently in -mm which might be from andre.przywara@xxxxxxx are
mm-convert-p_mknonnuma-and-remaining-page-table-manipulations.patch
mm-convert-p_mknonnuma-and-remaining-page-table-manipulations-fix-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
