A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'x86/build' into locking/core, to pick up dependent patches and unify jump-label work

Browse source 
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2018-10-16 17:30:11 +02:00
commit ec57e2f0ac
813 changed files with 8080 additions and 4630 deletions
Download patch file Download diff file Expand all files Collapse all files

1
kernel/locking/lockdep.c
View file

@ -55,7 +55,6 @@
#include "lockdep_internals.h"
#include <trace/events/preemptirq.h>
#define CREATE_TRACE_POINTS
#include <trace/events/lock.h>

2
kernel/locking/test-ww_mutex.c
View file

@ -324,7 +324,7 @@ static int __test_cycle(unsigned int nthreads)
if (!cycle->result)
continue;
pr_err("cylic deadlock not resolved, ret[%d/%d] = %d\n",
pr_err("cyclic deadlock not resolved, ret[%d/%d] = %d\n",
n, nthreads, cycle->result);
ret = -EINVAL;
break;