aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.9.21/0017-kaiser-name-that-0x1000-KAISER_SHADOW_PGD_OFFSET.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.9.21/0017-kaiser-name-that-0x1000-KAISER_SHADOW_PGD_OFFSET.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.9.21/0017-kaiser-name-that-0x1000-KAISER_SHADOW_PGD_OFFSET.patch70
1 files changed, 0 insertions, 70 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.9.21/0017-kaiser-name-that-0x1000-KAISER_SHADOW_PGD_OFFSET.patch b/common/recipes-kernel/linux/linux-yocto-4.9.21/0017-kaiser-name-that-0x1000-KAISER_SHADOW_PGD_OFFSET.patch
deleted file mode 100644
index f43ed637..00000000
--- a/common/recipes-kernel/linux/linux-yocto-4.9.21/0017-kaiser-name-that-0x1000-KAISER_SHADOW_PGD_OFFSET.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From ed14e28d25f96ab356ced2a7e9af56fac6483f4d Mon Sep 17 00:00:00 2001
-From: Hugh Dickins <hughd@google.com>
-Date: Sat, 9 Sep 2017 17:31:18 -0700
-Subject: [PATCH 017/103] kaiser: name that 0x1000 KAISER_SHADOW_PGD_OFFSET
-
-There's a 0x1000 in various places, which looks better with a name.
-
-Signed-off-by: Hugh Dickins <hughd@google.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/x86/entry/entry_64.S | 4 ++--
- arch/x86/include/asm/kaiser.h | 7 +++++--
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
-index 57f7993..3c8fc97 100644
---- a/arch/x86/entry/entry_64.S
-+++ b/arch/x86/entry/entry_64.S
-@@ -1316,7 +1316,7 @@ ENTRY(nmi)
- movq %cr3, %rax
- pushq %rax
- #ifdef CONFIG_KAISER_REAL_SWITCH
-- andq $(~0x1000), %rax
-+ andq $(~KAISER_SHADOW_PGD_OFFSET), %rax
- #endif
- movq %rax, %cr3
- #endif
-@@ -1559,7 +1559,7 @@ end_repeat_nmi:
- movq %cr3, %rax
- pushq %rax
- #ifdef CONFIG_KAISER_REAL_SWITCH
-- andq $(~0x1000), %rax
-+ andq $(~KAISER_SHADOW_PGD_OFFSET), %rax
- #endif
- movq %rax, %cr3
- #endif
-diff --git a/arch/x86/include/asm/kaiser.h b/arch/x86/include/asm/kaiser.h
-index 7394ba9..051acf6 100644
---- a/arch/x86/include/asm/kaiser.h
-+++ b/arch/x86/include/asm/kaiser.h
-@@ -13,13 +13,16 @@
- * A minimalistic kernel mapping holds the parts needed to be mapped in user
- * mode, such as the entry/exit functions of the user space, or the stacks.
- */
-+
-+#define KAISER_SHADOW_PGD_OFFSET 0x1000
-+
- #ifdef __ASSEMBLY__
- #ifdef CONFIG_KAISER
-
- .macro _SWITCH_TO_KERNEL_CR3 reg
- movq %cr3, \reg
- #ifdef CONFIG_KAISER_REAL_SWITCH
--andq $(~0x1000), \reg
-+andq $(~KAISER_SHADOW_PGD_OFFSET), \reg
- #endif
- movq \reg, %cr3
- .endm
-@@ -27,7 +30,7 @@ movq \reg, %cr3
- .macro _SWITCH_TO_USER_CR3 reg
- movq %cr3, \reg
- #ifdef CONFIG_KAISER_REAL_SWITCH
--orq $(0x1000), \reg
-+orq $(KAISER_SHADOW_PGD_OFFSET), \reg
- #endif
- movq \reg, %cr3
- .endm
---
-2.7.4
-