diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-16 09:06:57 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-16 09:06:57 +0200 |
commit | 956f004a044007ea3b8fb19a525535933bb4f2a4 (patch) | |
tree | a8dbe5a16d8786083bd1e3393c36133b74c30691 /arch/openrisc/include/asm/pgalloc.h | |
parent | staging: gasket: remove gasket_wait_sync() (diff) | |
parent | Linux 4.18-rc5 (diff) | |
download | linux-956f004a044007ea3b8fb19a525535933bb4f2a4.tar.xz linux-956f004a044007ea3b8fb19a525535933bb4f2a4.zip |
Merge 4.18-rc5 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/openrisc/include/asm/pgalloc.h')
-rw-r--r-- | arch/openrisc/include/asm/pgalloc.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/openrisc/include/asm/pgalloc.h b/arch/openrisc/include/asm/pgalloc.h index 3e1a46615120..8999b9226512 100644 --- a/arch/openrisc/include/asm/pgalloc.h +++ b/arch/openrisc/include/asm/pgalloc.h @@ -98,8 +98,12 @@ static inline void pte_free(struct mm_struct *mm, struct page *pte) __free_page(pte); } +#define __pte_free_tlb(tlb, pte, addr) \ +do { \ + pgtable_page_dtor(pte); \ + tlb_remove_page((tlb), (pte)); \ +} while (0) -#define __pte_free_tlb(tlb, pte, addr) tlb_remove_page((tlb), (pte)) #define pmd_pgtable(pmd) pmd_page(pmd) #define check_pgt_cache() do { } while (0) |