diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-21 12:53:29 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-21 12:53:29 -0400 |
| commit | d661cd92872c89f43fb019926f6b1a3e5ee2bcfc (patch) | |
| tree | e6efa88e6e845fe2b93e3f257240b6e70d2d299d | |
| parent | 5d75c700b11b303d81d14600fe9ff5fa71946366 (diff) | |
| download | longterm-queue-5.2-d661cd92872c89f43fb019926f6b1a3e5ee2bcfc.tar.gz | |
sh: pgalloc: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/sh-tlb-Fix-PGTABLE_LEVELS-2.patch | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/queue/sh-tlb-Fix-PGTABLE_LEVELS-2.patch b/queue/sh-tlb-Fix-PGTABLE_LEVELS-2.patch index 2ecb361d..cd52e55c 100644 --- a/queue/sh-tlb-Fix-PGTABLE_LEVELS-2.patch +++ b/queue/sh-tlb-Fix-PGTABLE_LEVELS-2.patch @@ -1,4 +1,4 @@ -From c7bcbc8ab9cb20536b8f50c62a48cebda965fdba Mon Sep 17 00:00:00 2001 +From 3c176a9c305cefa67a11c9c50753274d44b3ea9f Mon Sep 17 00:00:00 2001 From: Peter Zijlstra <peterz@infradead.org> Date: Fri, 17 Jul 2020 13:10:07 +0200 Subject: [PATCH] sh/tlb: Fix PGTABLE_LEVELS > 2 @@ -21,10 +21,10 @@ Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Rich Felker <dalias@libc.org> diff --git a/arch/sh/include/asm/pgalloc.h b/arch/sh/include/asm/pgalloc.h -index 22d968bfe9bb..d770da3f8b6f 100644 +index b56f908b1395..c267035421f1 100644 --- a/arch/sh/include/asm/pgalloc.h +++ b/arch/sh/include/asm/pgalloc.h -@@ -12,6 +12,7 @@ extern void pgd_free(struct mm_struct *mm, pgd_t *pgd); +@@ -14,6 +14,7 @@ extern void pgd_free(struct mm_struct *mm, pgd_t *pgd); extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd); extern pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address); extern void pmd_free(struct mm_struct *mm, pmd_t *pmd); @@ -32,7 +32,7 @@ index 22d968bfe9bb..d770da3f8b6f 100644 #endif static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, -@@ -33,13 +34,4 @@ do { \ +@@ -70,15 +71,6 @@ do { \ tlb_remove_page((tlb), (pte)); \ } while (0) @@ -45,7 +45,9 @@ index 22d968bfe9bb..d770da3f8b6f 100644 -} while (0); -#endif - - #endif /* __ASM_SH_PGALLOC_H */ + static inline void check_pgt_cache(void) + { + quicklist_trim(QUICK_PT, NULL, 25, 16); -- 2.27.0 |