From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 7 Nov 2020 11:50:48 +0000 (+0100)
Subject: Merge branch 'linus' into perf/kprobes
X-Git-Tag: microblaze-v5.12~179^2~1
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=666fab4a3ea143315a9c059fad9f3a0f1365d54b

Merge branch 'linus' into perf/kprobes

Conflicts:
	include/asm-generic/atomic-instrumented.h
	kernel/kprobes.c

Use the upstream atomic-instrumented.h checksum, and pick
the kprobes version of kernel/kprobes.c, which effectively
reverts this upstream workaround:

  645f224e7ba2: ("kprobes: Tell lockdep about kprobe nesting")

Since the new code *should* be fine without nesting.

Knock on wood ...

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

666fab4a3ea143315a9c059fad9f3a0f1365d54b
diff --cc kernel/fork.c
index 53a1f508a097,32083db7a2a2..b9c289d0f4ef
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@@ -2161,13 -2187,9 +2187,13 @@@ static __latent_entropy struct task_str
  	INIT_LIST_HEAD(&p->thread_group);
  	p->task_works = NULL;
  
 +#ifdef CONFIG_KRETPROBES
 +	p->kretprobe_instances.first = NULL;
 +#endif
 +
  	/*
  	 * Ensure that the cgroup subsystem policies allow the new process to be
- 	 * forked. It should be noted the the new process's css_set can be changed
+ 	 * forked. It should be noted that the new process's css_set can be changed
  	 * between here and cgroup_post_fork() if an organisation operation is in
  	 * progress.
  	 */