aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.9.21/0008-kaiser-fix-build-and-FIXME-in-alloc_ldt_struct.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.9.21/0008-kaiser-fix-build-and-FIXME-in-alloc_ldt_struct.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.9.21/0008-kaiser-fix-build-and-FIXME-in-alloc_ldt_struct.patch55
1 files changed, 0 insertions, 55 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.9.21/0008-kaiser-fix-build-and-FIXME-in-alloc_ldt_struct.patch b/common/recipes-kernel/linux/linux-yocto-4.9.21/0008-kaiser-fix-build-and-FIXME-in-alloc_ldt_struct.patch
deleted file mode 100644
index a3bda594..00000000
--- a/common/recipes-kernel/linux/linux-yocto-4.9.21/0008-kaiser-fix-build-and-FIXME-in-alloc_ldt_struct.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 183131e8c381ffb7c32a09a7356cb25450d2bd40 Mon Sep 17 00:00:00 2001
-From: Hugh Dickins <hughd@google.com>
-Date: Sun, 3 Sep 2017 17:09:44 -0700
-Subject: [PATCH 008/103] kaiser: fix build and FIXME in alloc_ldt_struct()
-
-Include linux/kaiser.h instead of asm/kaiser.h to build ldt.c without
-CONFIG_KAISER. kaiser_add_mapping() does already return an error code,
-so fix the FIXME.
-
-Signed-off-by: Hugh Dickins <hughd@google.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/x86/kernel/ldt.c | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
-index 3c2d55b..8331bad 100644
---- a/arch/x86/kernel/ldt.c
-+++ b/arch/x86/kernel/ldt.c
-@@ -15,9 +15,9 @@
- #include <linux/slab.h>
- #include <linux/vmalloc.h>
- #include <linux/uaccess.h>
-+#include <linux/kaiser.h>
-
- #include <asm/ldt.h>
--#include <asm/kaiser.h>
- #include <asm/desc.h>
- #include <asm/mmu_context.h>
- #include <asm/syscalls.h>
-@@ -48,7 +48,7 @@ static struct ldt_struct *alloc_ldt_struct(int size)
- {
- struct ldt_struct *new_ldt;
- int alloc_size;
-- int ret = 0;
-+ int ret;
-
- if (size > LDT_ENTRIES)
- return NULL;
-@@ -76,10 +76,8 @@ static struct ldt_struct *alloc_ldt_struct(int size)
- return NULL;
- }
-
-- // FIXME: make kaiser_add_mapping() return an error code
-- // when it fails
-- kaiser_add_mapping((unsigned long)new_ldt->entries, alloc_size,
-- __PAGE_KERNEL);
-+ ret = kaiser_add_mapping((unsigned long)new_ldt->entries, alloc_size,
-+ __PAGE_KERNEL);
- if (ret) {
- __free_ldt_struct(new_ldt);
- return NULL;
---
-2.7.4
-