diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 12:43:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 12:43:05 +0100 |
| commit | 81444a799550214f549caf579cf65a0ca55e70b7 (patch) | |
| tree | 3288dac0740be2e1e7d1af4ee51d792a6e91edf3 /kernel/trace/trace_branch.c | |
| parent | a64d31baed104be25305e9c71585d3ea4ee9a418 (diff) | |
| parent | da485e0cb16726797e99a595a399b9fc721b91bc (diff) | |
Merge branch 'tracing/fastboot' into cpus4096
Diffstat (limited to 'kernel/trace/trace_branch.c')
| -rw-r--r-- | kernel/trace/trace_branch.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c index 877ee88e6a74..6c00feb3bac7 100644 --- a/kernel/trace/trace_branch.c +++ b/kernel/trace/trace_branch.c @@ -6,6 +6,7 @@ #include <linux/kallsyms.h> #include <linux/seq_file.h> #include <linux/spinlock.h> +#include <linux/irqflags.h> #include <linux/debugfs.h> #include <linux/uaccess.h> #include <linux/module.h> @@ -41,7 +42,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect) if (unlikely(!tr)) return; - raw_local_irq_save(flags); + local_irq_save(flags); cpu = raw_smp_processor_id(); if (atomic_inc_return(&tr->data[cpu]->disabled) != 1) goto out; @@ -73,7 +74,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect) out: atomic_dec(&tr->data[cpu]->disabled); - raw_local_irq_restore(flags); + local_irq_restore(flags); } static inline |