mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-26 06:33:19 -04:00
Merge remote-tracking branch 'sm8350/lineage-20' into lineage-22.2
* sm8350/lineage-20: sched/headers: Move 'struct sched_param' out of uapi, to work around glibc/musl breakage ANDROID: binder: fix minimum node priority comparison ANDROID: 16K: Remove ELF padding entry from map_file ranges Linux 5.4.293 MIPS: cm: Fix warning if MIPS_CM is disabled crypto: atmel-sha204a - Set hwrng quality to lowest possible comedi: jr3_pci: Fix synchronous deletion of timer md/raid1: Add check for missing source disk in process_checks() scsi: pm80xx: Set phy_attached to zero when device is gone x86/bugs: Don't fill RSB on VMEXIT with eIBRS+retpoline ACPI PPTT: Fix coding mistakes in a couple of sizeof() calls selftests: ublk: fix test_stripe_04 udmabuf: fix a buf size overflow issue during udmabuf creation KVM: s390: Don't use %pK through tracepoints sched/isolation: Make CONFIG_CPU_ISOLATION depend on CONFIG_SMP ntb: reduce stack usage in idt_scan_mws qibfs: fix _another_ leak usb: gadget: aspeed: Add NULL pointer check in ast_vhub_init_dev() dmaengine: dmatest: Fix dmatest waiting less when interrupted usb: host: max3421-hcd: Add missing spi_device_id table ... Change-Id: Ic9ed345187af7171604f364f2abc621d180b26a9
This commit is contained in:
commit
c88830fe05
161 changed files with 1093 additions and 549 deletions
|
|
@ -5506,6 +5506,7 @@ ftrace_graph_set_hash(struct ftrace_hash *hash, char *buffer)
|
|||
}
|
||||
}
|
||||
}
|
||||
cond_resched();
|
||||
} while_for_each_ftrace_rec();
|
||||
out:
|
||||
mutex_unlock(&ftrace_lock);
|
||||
|
|
|
|||
|
|
@ -405,7 +405,9 @@ static int __ftrace_event_enable_disable(struct trace_event_file *file,
|
|||
clear_bit(EVENT_FILE_FL_RECORDED_TGID_BIT, &file->flags);
|
||||
}
|
||||
|
||||
call->class->reg(call, TRACE_REG_UNREGISTER, file);
|
||||
ret = call->class->reg(call, TRACE_REG_UNREGISTER, file);
|
||||
|
||||
WARN_ON_ONCE(ret);
|
||||
}
|
||||
/* If in SOFT_MODE, just set the SOFT_DISABLE_BIT, else clear it */
|
||||
if (file->flags & EVENT_FILE_FL_SOFT_MODE)
|
||||
|
|
|
|||
Loading…
Reference in a new issue