diff options
author | Michael Bestas <mkbestas@lineageos.org> | 2021-07-10 21:26:34 +0300 |
---|---|---|
committer | Michael Bestas <mkbestas@lineageos.org> | 2021-07-10 21:26:34 +0300 |
commit | 3c741a8b469c522434e6841d8618702303fd6a21 (patch) | |
tree | f95f59bb8f761500862e72b98f9b266ecfdcc82e /init | |
parent | d46db1f472cf55742a7a2db10218cdcc084e0daf (diff) | |
parent | b5f0035416310da3ccfaf160e6d856c294ec3bf5 (diff) |
Merge branch 'android-4.4-p' of https://android.googlesource.com/kernel/common into lineage-18.1-caf-msm8998
This brings LA.UM.9.2.r1-03400-SDMxx0.0 up to date with
https://android.googlesource.com/kernel/common/ android-4.4-p at commit:
b5f0035416310 Merge 4.4.274 into android-4.4-p
Conflicts:
include/linux/spi/spi.h
Change-Id: I3daac7891ee93c70ffe08b7e70b77e8b2989af67
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 48e8370966ce..6fce605c6caf 100644 --- a/init/main.c +++ b/init/main.c @@ -1016,7 +1016,7 @@ static noinline void __init kernel_init_freeable(void) */ set_cpus_allowed_ptr(current, cpu_all_mask); - cad_pid = task_pid(current); + cad_pid = get_pid(task_pid(current)); smp_prepare_cpus(setup_max_cpus); |