Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

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

diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
index 9bef475db6fefe1e3b79c04cff754efd1b383de0..d3776cb494c0b3eb9c82dadf46a8d6e8f8452a0c 100644 (file)
--- a/include/asm-generic/pgtable-nopud.h
+++ b/include/asm-generic/pgtable-nopud.h
@@ -35,6 +35,7 @@ static inline void p4d_clear(p4d_t *p4d)      { }
 #define pud_ERROR(pud)                         (p4d_ERROR((pud).p4d))
 
 #define p4d_populate(mm, p4d, pud)             do { } while (0)
+#define p4d_populate_safe(mm, p4d, pud)                do { } while (0)
 /*
  * (puds are folded into p4ds so this doesn't get actually called,
  * but the define is needed for a generic inline function.)
@@ -58,7 +59,7 @@ static inline pud_t *pud_offset(p4d_t *p4d, unsigned long address)
  */
 #define pud_alloc_one(mm, address)             NULL
 #define pud_free(mm, x)                                do { } while (0)
-#define __pud_free_tlb(tlb, x, a)              do { } while (0)
+#define pud_free_tlb(tlb, x, a)                        do { } while (0)
 
 #undef  pud_addr_end
 #define pud_addr_end(addr, end)                        (end)