release 6.12.4 (preliminary)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 0bbb6450b1ba362c1c2e7d8d752b39ec9844629b Mon Sep 17 00:00:00 2001
|
||||
From b492213c96ded86e7800b320706ad15bd31c7c1b Mon Sep 17 00:00:00 2001
|
||||
From: Christian Brauner <christian@brauner.io>
|
||||
Date: Wed, 16 Jan 2019 23:13:25 +0100
|
||||
Subject: [PATCH 1/4] binder: turn into module
|
||||
@@ -29,21 +29,6 @@ Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
|
||||
[ arighi: zap_page_range() has been dropped, export zap_page_range_single() in 6.3 ]
|
||||
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
|
||||
Signed-off-by: Alexandre Frade <kernel@xanmod.org>
|
||||
---
|
||||
drivers/android/Kconfig | 6 +++---
|
||||
drivers/android/binder.c | 17 ++++++++++++++---
|
||||
drivers/android/binder_alloc.h | 3 ++-
|
||||
drivers/android/binder_internal.h | 5 +++--
|
||||
drivers/android/binderfs.c | 6 +++---
|
||||
fs/file.c | 1 +
|
||||
include/linux/ipc_namespace.h | 3 +++
|
||||
ipc/namespace.c | 17 +++++++++++++++++
|
||||
kernel/sched/syscalls.c | 1 +
|
||||
kernel/task_work.c | 1 +
|
||||
mm/memory.c | 1 +
|
||||
mm/vmalloc.c | 1 +
|
||||
security/security.c | 4 ++++
|
||||
14 files changed, 61 insertions(+), 15 deletions(-)
|
||||
|
||||
--- a/drivers/android/Kconfig
|
||||
+++ b/drivers/android/Kconfig
|
||||
@@ -60,7 +45,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
|
||||
Binderfs is a pseudo-filesystem for the Android Binder IPC driver
|
||||
--- a/drivers/android/binder.c
|
||||
+++ b/drivers/android/binder.c
|
||||
@@ -6713,9 +6713,20 @@ err_alloc_device_names_failed:
|
||||
@@ -7027,9 +7027,20 @@ err_alloc_device_names_failed:
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -133,7 +118,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
|
||||
static inline int __init init_binderfs(void)
|
||||
--- a/drivers/android/binderfs.c
|
||||
+++ b/drivers/android/binderfs.c
|
||||
@@ -120,7 +120,7 @@ static int binderfs_binder_device_create
|
||||
@@ -122,7 +122,7 @@ static int binderfs_binder_device_create
|
||||
struct super_block *sb = ref_inode->i_sb;
|
||||
struct binderfs_info *info = sb->s_fs_info;
|
||||
#if defined(CONFIG_IPC_NS)
|
||||
@@ -142,7 +127,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
|
||||
#else
|
||||
bool use_reserve = true;
|
||||
#endif
|
||||
@@ -397,7 +397,7 @@ static int binderfs_binder_ctl_create(st
|
||||
@@ -399,7 +399,7 @@ static int binderfs_binder_ctl_create(st
|
||||
struct dentry *root = sb->s_root;
|
||||
struct binderfs_info *info = sb->s_fs_info;
|
||||
#if defined(CONFIG_IPC_NS)
|
||||
@@ -151,7 +136,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
|
||||
#else
|
||||
bool use_reserve = true;
|
||||
#endif
|
||||
@@ -683,7 +683,7 @@ static int binderfs_fill_super(struct su
|
||||
@@ -691,7 +691,7 @@ static int binderfs_fill_super(struct su
|
||||
return -ENOMEM;
|
||||
info = sb->s_fs_info;
|
||||
|
||||
@@ -199,7 +184,7 @@ Signed-off-by: Alexandre Frade <kernel@xanmod.org>
|
||||
return container_of(ns, struct ipc_namespace, ns);
|
||||
--- a/mm/vmalloc.c
|
||||
+++ b/mm/vmalloc.c
|
||||
@@ -3166,6 +3166,7 @@ struct vm_struct *get_vm_area(unsigned l
|
||||
@@ -3176,6 +3176,7 @@ struct vm_struct *get_vm_area(unsigned l
|
||||
NUMA_NO_NODE, GFP_KERNEL,
|
||||
__builtin_return_address(0));
|
||||
}
|
||||
|
Reference in New Issue
Block a user