Merge branch 'linus' into sched/core, to resolve semantic conflict

[linux-2.6-microblaze.git] / kernel / trace / bpf_trace.c

diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index 048c655..818cf8a 100644 (file)
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -1096,7 +1096,7 @@ static int bpf_send_signal_common(u32 sig, enum pid_type type)
                        return -EINVAL;
 
                work = this_cpu_ptr(&send_signal_work);
-               if (atomic_read(&work->irq_work.flags) & IRQ_WORK_BUSY)
+               if (irq_work_is_busy(&work->irq_work))
                        return -EBUSY;
 
                /* Add the current task, which is the target of sending signal,