Merge commit '533b220f7be4' ("Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux") into android-mainline

arm64 baby steps along the way to 5.8-rc1.

Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I245a58d34012df3a7c5702bc05f6f4803e53856e
This commit is contained in:
Will Deacon
2020-06-09 13:29:17 +01:00
159 changed files with 2561 additions and 980 deletions

View File

@@ -94,6 +94,7 @@
#include <linux/thread_info.h>
#include <linux/stackleak.h>
#include <linux/kasan.h>
#include <linux/scs.h>
#include <linux/cpufreq_times.h>
#include <asm/pgtable.h>
@@ -458,6 +459,7 @@ void put_task_stack(struct task_struct *tsk)
void free_task(struct task_struct *tsk)
{
cpufreq_task_times_exit(tsk);
scs_release(tsk);
#ifndef CONFIG_THREAD_INFO_IN_TASK
/*
@@ -843,6 +845,8 @@ void __init fork_init(void)
NULL, free_vm_stack_cache);
#endif
scs_init();
lockdep_init_task(&init_task);
uprobes_init();
}
@@ -902,6 +906,10 @@ static struct task_struct *dup_task_struct(struct task_struct *orig, int node)
if (err)
goto free_stack;
err = scs_prepare(tsk, node);
if (err)
goto free_stack;
#ifdef CONFIG_SECCOMP
/*
* We must handle setting up seccomp filters once we're under