aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.9.21/0031-kaiser-drop-is_atomic-arg-to-kaiser_pagetable_walk.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.9.21/0031-kaiser-drop-is_atomic-arg-to-kaiser_pagetable_walk.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.9.21/0031-kaiser-drop-is_atomic-arg-to-kaiser_pagetable_walk.patch55
1 files changed, 0 insertions, 55 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.9.21/0031-kaiser-drop-is_atomic-arg-to-kaiser_pagetable_walk.patch b/common/recipes-kernel/linux/linux-yocto-4.9.21/0031-kaiser-drop-is_atomic-arg-to-kaiser_pagetable_walk.patch
deleted file mode 100644
index d78da68d..00000000
--- a/common/recipes-kernel/linux/linux-yocto-4.9.21/0031-kaiser-drop-is_atomic-arg-to-kaiser_pagetable_walk.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 37261333171ffce6be264a70a6a8db11616b2d6f Mon Sep 17 00:00:00 2001
-From: Hugh Dickins <hughd@google.com>
-Date: Sun, 29 Oct 2017 11:36:19 -0700
-Subject: [PATCH 031/103] kaiser: drop is_atomic arg to kaiser_pagetable_walk()
-
-I have not observed a might_sleep() warning from setup_fixmap_gdt()'s
-use of kaiser_add_mapping() in our tree (why not?), but like upstream
-we have not provided a way for that to pass is_atomic true down to
-kaiser_pagetable_walk(), and at startup it's far from a likely source
-of trouble: so just delete the walk's is_atomic arg and might_sleep().
-
-Signed-off-by: Hugh Dickins <hughd@google.com>
-Acked-by: Jiri Kosina <jkosina@suse.cz>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/x86/mm/kaiser.c | 10 ++--------
- 1 file changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/arch/x86/mm/kaiser.c b/arch/x86/mm/kaiser.c
-index b8aa9ad..65ac3fd 100644
---- a/arch/x86/mm/kaiser.c
-+++ b/arch/x86/mm/kaiser.c
-@@ -107,19 +107,13 @@ static inline unsigned long get_pa_from_mapping(unsigned long vaddr)
- *
- * Returns a pointer to a PTE on success, or NULL on failure.
- */
--static pte_t *kaiser_pagetable_walk(unsigned long address, bool is_atomic)
-+static pte_t *kaiser_pagetable_walk(unsigned long address)
- {
- pmd_t *pmd;
- pud_t *pud;
- pgd_t *pgd = native_get_shadow_pgd(pgd_offset_k(address));
- gfp_t gfp = (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO);
-
-- if (is_atomic) {
-- gfp &= ~GFP_KERNEL;
-- gfp |= __GFP_HIGH | __GFP_ATOMIC;
-- } else
-- might_sleep();
--
- if (pgd_none(*pgd)) {
- WARN_ONCE(1, "All shadow pgds should have been populated");
- return NULL;
-@@ -194,7 +188,7 @@ static int kaiser_add_user_map(const void *__start_addr, unsigned long size,
- ret = -EIO;
- break;
- }
-- pte = kaiser_pagetable_walk(address, false);
-+ pte = kaiser_pagetable_walk(address);
- if (!pte) {
- ret = -ENOMEM;
- break;
---
-2.7.4
-