diff options
author | Brian Wood <brian.j.wood@intel.com> | 2017-02-27 16:58:40 -0800 |
---|---|---|
committer | Brian Wood <brian.j.wood@intel.com> | 2017-02-28 15:35:14 -0800 |
commit | b7147432cf0d58533bd21fe594d0be1d153f91a6 (patch) | |
tree | aec042cd9c91432c09285381c5d5af85072975c9 /kernel/trace/trace_irqsoff.c | |
parent | ce7cfcfa1251122880d34fae7259309b64a78434 (diff) | |
parent | ec55e7c2bf49a426b6f8204505bd267c77554d37 (diff) | |
download | edison-v3.10-b7147432cf0d58533bd21fe594d0be1d153f91a6.tar.gz |
Merge remote-tracking branch 'remotes/origin/brillo/linux-3.10.y' into Brillo-20170221-3.10_kernelandroid-n-iot-preview-4n-iot-preview-4
Conflicts:
crypto/blkcipher.c
drivers/platform/x86/intel_scu_ipcutil.c
drivers/usb/gadget/u_ether.c
fs/ext4/extents.c
net/bluetooth/sco.c
net/wireless/scan.c
Change-Id: Iaea6d22acb3da6b0477d71cf546858d35295e3d2
Diffstat (limited to 'kernel/trace/trace_irqsoff.c')
-rw-r--r-- | kernel/trace/trace_irqsoff.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c index 2aefbee93a6..56e083e26ca 100644 --- a/kernel/trace/trace_irqsoff.c +++ b/kernel/trace/trace_irqsoff.c @@ -118,8 +118,12 @@ static int func_prolog_dec(struct trace_array *tr, return 0; local_save_flags(*flags); - /* slight chance to get a false positive on tracing_cpu */ - if (!irqs_disabled_flags(*flags)) + /* + * Slight chance to get a false positive on tracing_cpu, + * although I'm starting to think there isn't a chance. + * Leave this for now just to be paranoid. + */ + if (!irqs_disabled_flags(*flags) && !preempt_count()) return 0; *data = per_cpu_ptr(tr->trace_buffer.data, cpu); |