mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'core/locking' into tracing/ftrace
This commit is contained in:
commit
480c93df5b
98 changed files with 983 additions and 716 deletions
|
|
@ -191,7 +191,7 @@ asmlinkage void __do_softirq(void)
|
|||
account_system_vtime(current);
|
||||
|
||||
__local_bh_disable((unsigned long)__builtin_return_address(0));
|
||||
trace_softirq_enter();
|
||||
lockdep_softirq_enter();
|
||||
|
||||
cpu = smp_processor_id();
|
||||
restart:
|
||||
|
|
@ -231,7 +231,7 @@ restart:
|
|||
if (pending)
|
||||
wakeup_softirqd();
|
||||
|
||||
trace_softirq_exit();
|
||||
lockdep_softirq_exit();
|
||||
|
||||
account_system_vtime(current);
|
||||
_local_bh_enable();
|
||||
|
|
|
|||
Loading…
Reference in a new issue