Update Debian kernel to v5.18.1
This commit is contained in:
Maximilian Luz
parent
56c500105a
commit
0353ae0d8e
4
.github/workflows/debian.yml
vendored
4
.github/workflows/debian.yml
vendored
|
|
@ -7,8 +7,8 @@ name: Debian
|
|||
|
||||
env:
|
||||
GPG_KEY_ID: 56C464BAAC421453
|
||||
KERNEL_VERSION: 5.17.9
|
||||
KERNEL_REVISION: 2
|
||||
KERNEL_VERSION: 5.18.1
|
||||
KERNEL_REVISION: 1
|
||||
LOCALVERSION: -surface
|
||||
MAINLINE_REPO: git://git.launchpad.net/~ubuntu-kernel-test/ubuntu/+source/linux/+git/mainline-crack
|
||||
MAINLINE_BRANCH: cod/mainline
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From d769fb32cc1fde10896380418e74f6b1511f83dd Mon Sep 17 00:00:00 2001
|
||||
From 42ca7cec6b266bd2a73488b175ea29487e2b22af Mon Sep 17 00:00:00 2001
|
||||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Mon, 7 Sep 2020 02:51:53 +0100
|
||||
Subject: [PATCH 1/2] Export symbols needed by Android drivers
|
||||
|
|
@ -21,10 +21,10 @@ Export the currently un-exported symbols they depend on.
|
|||
8 files changed, 11 insertions(+)
|
||||
|
||||
diff --git a/fs/file.c b/fs/file.c
|
||||
index ad4a8bf3cf10..4d75dd415d58 100644
|
||||
index ee9317346702..9885f25f5340 100644
|
||||
--- a/fs/file.c
|
||||
+++ b/fs/file.c
|
||||
@@ -804,6 +804,7 @@ int close_fd_get_file(unsigned int fd, struct file **res)
|
||||
@@ -833,6 +833,7 @@ int close_fd_get_file(unsigned int fd, struct file **res)
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -33,10 +33,10 @@ index ad4a8bf3cf10..4d75dd415d58 100644
|
|||
void do_close_on_exec(struct files_struct *files)
|
||||
{
|
||||
diff --git a/kernel/fork.c b/kernel/fork.c
|
||||
index 10885c649ca4..0fb1d884af77 100644
|
||||
index 35a3beff140b..1e9ecaa4f5ac 100644
|
||||
--- a/kernel/fork.c
|
||||
+++ b/kernel/fork.c
|
||||
@@ -1153,6 +1153,7 @@ void mmput_async(struct mm_struct *mm)
|
||||
@@ -1222,6 +1222,7 @@ void mmput_async(struct mm_struct *mm)
|
||||
schedule_work(&mm->async_put_work);
|
||||
}
|
||||
}
|
||||
|
|
@ -45,10 +45,10 @@ index 10885c649ca4..0fb1d884af77 100644
|
|||
|
||||
/**
|
||||
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
|
||||
index 0d12ec7be301..57046ac84be2 100644
|
||||
index d58c0389eb23..b4ca294b5100 100644
|
||||
--- a/kernel/sched/core.c
|
||||
+++ b/kernel/sched/core.c
|
||||
@@ -6935,6 +6935,7 @@ int can_nice(const struct task_struct *p, const int nice)
|
||||
@@ -6940,6 +6940,7 @@ int can_nice(const struct task_struct *p, const int nice)
|
||||
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
|
||||
capable(CAP_SYS_NICE));
|
||||
}
|
||||
|
|
@ -57,10 +57,10 @@ index 0d12ec7be301..57046ac84be2 100644
|
|||
#ifdef __ARCH_WANT_SYS_NICE
|
||||
|
||||
diff --git a/kernel/sched/wait.c b/kernel/sched/wait.c
|
||||
index eca38107b32f..2e645b076916 100644
|
||||
index 9860bb9a847c..ad76d49bf4e1 100644
|
||||
--- a/kernel/sched/wait.c
|
||||
+++ b/kernel/sched/wait.c
|
||||
@@ -244,6 +244,7 @@ void __wake_up_pollfree(struct wait_queue_head *wq_head)
|
||||
@@ -243,6 +243,7 @@ void __wake_up_pollfree(struct wait_queue_head *wq_head)
|
||||
/* POLLFREE must have cleared the queue. */
|
||||
WARN_ON_ONCE(waitqueue_active(wq_head));
|
||||
}
|
||||
|
|
@ -69,7 +69,7 @@ index eca38107b32f..2e645b076916 100644
|
|||
/*
|
||||
* Note: we use "set_current_state()" _after_ the wait-queue add,
|
||||
diff --git a/kernel/task_work.c b/kernel/task_work.c
|
||||
index 1698fbe6f0e1..2a1644189182 100644
|
||||
index c59e1a49bc40..d92b8726b1d4 100644
|
||||
--- a/kernel/task_work.c
|
||||
+++ b/kernel/task_work.c
|
||||
@@ -60,6 +60,7 @@ int task_work_add(struct task_struct *task, struct callback_head *work,
|
||||
|
|
@ -81,10 +81,10 @@ index 1698fbe6f0e1..2a1644189182 100644
|
|||
/**
|
||||
* task_work_cancel_match - cancel a pending work added by task_work_add()
|
||||
diff --git a/mm/memory.c b/mm/memory.c
|
||||
index c52be6d6b605..43012ba7ede7 100644
|
||||
index 76e3af9639d9..90a8d8730876 100644
|
||||
--- a/mm/memory.c
|
||||
+++ b/mm/memory.c
|
||||
@@ -1655,6 +1655,7 @@ void zap_page_range(struct vm_area_struct *vma, unsigned long start,
|
||||
@@ -1671,6 +1671,7 @@ void zap_page_range(struct vm_area_struct *vma, unsigned long start,
|
||||
mmu_notifier_invalidate_range_end(&range);
|
||||
tlb_finish_mmu(&tlb);
|
||||
}
|
||||
|
|
@ -93,10 +93,10 @@ index c52be6d6b605..43012ba7ede7 100644
|
|||
/**
|
||||
* zap_page_range_single - remove user pages in a given range
|
||||
diff --git a/mm/shmem.c b/mm/shmem.c
|
||||
index b5860f4a2738..c1f352f4717d 100644
|
||||
index 4b2fea33158e..0fcd0cfea35d 100644
|
||||
--- a/mm/shmem.c
|
||||
+++ b/mm/shmem.c
|
||||
@@ -4162,6 +4162,7 @@ int shmem_zero_setup(struct vm_area_struct *vma)
|
||||
@@ -4153,6 +4153,7 @@ int shmem_zero_setup(struct vm_area_struct *vma)
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -105,10 +105,10 @@ index b5860f4a2738..c1f352f4717d 100644
|
|||
/**
|
||||
* shmem_read_mapping_page_gfp - read into page cache, using specified page allocation flags.
|
||||
diff --git a/security/security.c b/security/security.c
|
||||
index 67264cb08fb3..3df62aa37ac0 100644
|
||||
index aaf6566deb9f..f32e312ef6fc 100644
|
||||
--- a/security/security.c
|
||||
+++ b/security/security.c
|
||||
@@ -751,24 +751,28 @@ int security_binder_set_context_mgr(const struct cred *mgr)
|
||||
@@ -753,24 +753,28 @@ int security_binder_set_context_mgr(const struct cred *mgr)
|
||||
{
|
||||
return call_int_hook(binder_set_context_mgr, 0, mgr);
|
||||
}
|
||||
|
|
@ -138,5 +138,5 @@ index 67264cb08fb3..3df62aa37ac0 100644
|
|||
int security_ptrace_access_check(struct task_struct *child, unsigned int mode)
|
||||
{
|
||||
--
|
||||
2.34.1
|
||||
2.36.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 44866318d156d7f410827afcb1b99b3535cdc9b7 Mon Sep 17 00:00:00 2001
|
||||
From 90504b74523733c7f9c256f1df8c70a1144c56ac Mon Sep 17 00:00:00 2001
|
||||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Fri, 22 Jun 2018 17:27:00 +0100
|
||||
Subject: [PATCH 2/2] android: Enable building ashmem and binder as modules
|
||||
|
|
@ -12,14 +12,18 @@ need them.
|
|||
- Change the Makefiles to build each driver as an object with the
|
||||
"_linux" suffix (which is what Anbox expects)
|
||||
- Change config symbol types to tristate
|
||||
|
||||
Update:
|
||||
In upstream commit 721412ed3d titled "staging: remove ashmem" the ashmem
|
||||
driver was removed entirely. Secondary commit message:
|
||||
"The mainline replacement for ashmem is memfd, so remove the legacy
|
||||
code from drivers/staging/"
|
||||
Consequently, the ashmem part of this patch has been removed.
|
||||
---
|
||||
drivers/android/Kconfig | 2 +-
|
||||
drivers/android/Makefile | 7 ++++---
|
||||
drivers/android/binder_alloc.c | 2 +-
|
||||
drivers/staging/android/Kconfig | 2 +-
|
||||
drivers/staging/android/Makefile | 3 ++-
|
||||
drivers/staging/android/ashmem.c | 3 +++
|
||||
6 files changed, 12 insertions(+), 7 deletions(-)
|
||||
drivers/android/Kconfig | 2 +-
|
||||
drivers/android/Makefile | 7 ++++---
|
||||
drivers/android/binder_alloc.c | 2 +-
|
||||
3 files changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig
|
||||
index 53b22e26266c..f3c50236e8d1 100644
|
||||
|
|
@ -50,7 +54,7 @@ index c9d3d0c99c25..55411d9a9c2a 100644
|
|||
+binder_linux-$(CONFIG_ANDROID_BINDERFS) += binderfs.o
|
||||
+binder_linux-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
|
||||
diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c
|
||||
index 340515f54498..9ad2387688de 100644
|
||||
index 2ac1008a5f39..0dbb30487a6e 100644
|
||||
--- a/drivers/android/binder_alloc.c
|
||||
+++ b/drivers/android/binder_alloc.c
|
||||
@@ -38,7 +38,7 @@ enum {
|
||||
|
|
@ -62,48 +66,6 @@ index 340515f54498..9ad2387688de 100644
|
|||
uint, 0644);
|
||||
|
||||
#define binder_alloc_debug(mask, x...) \
|
||||
diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
|
||||
index 70498adb1575..5c35653ed36d 100644
|
||||
--- a/drivers/staging/android/Kconfig
|
||||
+++ b/drivers/staging/android/Kconfig
|
||||
@@ -4,7 +4,7 @@ menu "Android"
|
||||
if ANDROID
|
||||
|
||||
config ASHMEM
|
||||
- bool "Enable the Anonymous Shared Memory Subsystem"
|
||||
+ tristate "Enable the Anonymous Shared Memory Subsystem"
|
||||
depends on SHMEM
|
||||
help
|
||||
The ashmem subsystem is a new shared memory allocator, similar to
|
||||
diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile
|
||||
index e9a55a5e6529..60cb8eacc793 100644
|
||||
--- a/drivers/staging/android/Makefile
|
||||
+++ b/drivers/staging/android/Makefile
|
||||
@@ -1,4 +1,5 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
ccflags-y += -I$(src) # needed for trace events
|
||||
|
||||
-obj-$(CONFIG_ASHMEM) += ashmem.o
|
||||
+obj-$(CONFIG_ASHMEM) += ashmem_linux.o
|
||||
+ashmem_linux-y += ashmem.o
|
||||
diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
|
||||
index ddbde3f8430e..2a92b0a7482f 100644
|
||||
--- a/drivers/staging/android/ashmem.c
|
||||
+++ b/drivers/staging/android/ashmem.c
|
||||
@@ -24,6 +24,7 @@
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/shmem_fs.h>
|
||||
+#include <linux/module.h>
|
||||
#include "ashmem.h"
|
||||
|
||||
#define ASHMEM_NAME_PREFIX "dev/ashmem/"
|
||||
@@ -968,3 +969,5 @@ static int __init ashmem_init(void)
|
||||
return ret;
|
||||
}
|
||||
device_initcall(ashmem_init);
|
||||
+
|
||||
+MODULE_LICENSE("GPL v2");
|
||||
--
|
||||
2.34.1
|
||||
2.36.1
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,10 @@
|
|||
## Disable debug info
|
||||
##
|
||||
|
||||
# CONFIG_DEBUG_INFO is not set
|
||||
CONFIG_DEBUG_INFO_NONE=y
|
||||
# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set
|
||||
# CONFIG_DEBUG_INFO_DWARF4 is not set
|
||||
# CONFIG_DEBUG_INFO_DWARF5 is not set
|
||||
|
||||
##
|
||||
## Do not build samples and tests
|
||||
|
|
|
|||
Loading…
Reference in a new issue