diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2018-02-01 09:04:17 -0500 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2018-02-01 09:04:17 -0500 |
| commit | 7bf14c28ee776be567855bd39ed8ff795ea19f55 (patch) | |
| tree | 6113748c673e85fccc2c56c050697789c00c6bc2 /include/linux/tracepoint.h | |
| parent | 87cedc6be55954c6efd6eca2e694132513f65a2a (diff) | |
| parent | 5fa4ec9cb2e6679e2f828033726f758ea314b9c5 (diff) | |
Merge branch 'x86/hyperv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Topic branch for stable KVM clockource under Hyper-V.
Thanks to Christoffer Dall for resolving the ARM conflict.
Diffstat (limited to 'include/linux/tracepoint.h')
| -rw-r--r-- | include/linux/tracepoint.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index a26ffbe09e71..c94f466d57ef 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h | |||
| @@ -137,11 +137,8 @@ extern void syscall_unregfunc(void); | |||
| 137 | \ | 137 | \ |
| 138 | if (!(cond)) \ | 138 | if (!(cond)) \ |
| 139 | return; \ | 139 | return; \ |
| 140 | if (rcucheck) { \ | 140 | if (rcucheck) \ |
| 141 | if (WARN_ON_ONCE(rcu_irq_enter_disabled())) \ | ||
| 142 | return; \ | ||
| 143 | rcu_irq_enter_irqson(); \ | 141 | rcu_irq_enter_irqson(); \ |
| 144 | } \ | ||
| 145 | rcu_read_lock_sched_notrace(); \ | 142 | rcu_read_lock_sched_notrace(); \ |
| 146 | it_func_ptr = rcu_dereference_sched((tp)->funcs); \ | 143 | it_func_ptr = rcu_dereference_sched((tp)->funcs); \ |
| 147 | if (it_func_ptr) { \ | 144 | if (it_func_ptr) { \ |