Merge branch 'for-linus' into for-next

[linux.git] / include / asm-generic / pgtable-nop4d.h

diff --git a/include/asm-generic/pgtable-nop4d.h b/include/asm-generic/pgtable-nop4d.h
index aebab905e6cd032677335c6df14b55a165449a22..ce2cbb3c380ff0a44f9897dc048b1a2d68558bfa 100644 (file)
--- a/include/asm-generic/pgtable-nop4d.h
+++ b/include/asm-generic/pgtable-nop4d.h
@@ -50,7 +50,7 @@ static inline p4d_t *p4d_offset(pgd_t *pgd, unsigned long address)
  */
 #define p4d_alloc_one(mm, address)             NULL
 #define p4d_free(mm, x)                                do { } while (0)
-#define __p4d_free_tlb(tlb, x, a)              do { } while (0)
+#define p4d_free_tlb(tlb, x, a)                        do { } while (0)
 
 #undef  p4d_addr_end
 #define p4d_addr_end(addr, end)                        (end)