aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_stack.c
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2008-12-02 15:34:05 -0500
committerIngo Molnar <mingo@elte.hu>2008-12-03 02:56:19 -0500
commita5e25883a445dce94a087ca479b21a5959cd5c18 (patch)
tree9453b1116b9784b91d63fd6a1110af0d62fd02b7 /kernel/trace/trace_stack.c
parentdfdc5437bd62dd6a26961e27f26b671374749875 (diff)
ftrace: replace raw_local_irq_save with local_irq_save
Impact: fix for lockdep and ftrace The raw_local_irq_save/restore confuses lockdep. This patch converts them to the local_irq_save/restore variants. Signed-off-by: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_stack.c')
-rw-r--r--kernel/trace/trace_stack.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
index fde3be15c642..06a16115be0f 100644
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c
@@ -48,7 +48,7 @@ static inline void check_stack(void)
48 if (!object_is_on_stack(&this_size)) 48 if (!object_is_on_stack(&this_size))
49 return; 49 return;
50 50
51 raw_local_irq_save(flags); 51 local_irq_save(flags);
52 __raw_spin_lock(&max_stack_lock); 52 __raw_spin_lock(&max_stack_lock);
53 53
54 /* a race could have already updated it */ 54 /* a race could have already updated it */
@@ -96,7 +96,7 @@ static inline void check_stack(void)
96 96
97 out: 97 out:
98 __raw_spin_unlock(&max_stack_lock); 98 __raw_spin_unlock(&max_stack_lock);
99 raw_local_irq_restore(flags); 99 local_irq_restore(flags);
100} 100}
101 101
102static void 102static void
@@ -162,11 +162,11 @@ stack_max_size_write(struct file *filp, const char __user *ubuf,
162 if (ret < 0) 162 if (ret < 0)
163 return ret; 163 return ret;
164 164
165 raw_local_irq_save(flags); 165 local_irq_save(flags);
166 __raw_spin_lock(&max_stack_lock); 166 __raw_spin_lock(&max_stack_lock);
167 *ptr = val; 167 *ptr = val;
168 __raw_spin_unlock(&max_stack_lock); 168 __raw_spin_unlock(&max_stack_lock);
169 raw_local_irq_restore(flags); 169 local_irq_restore(flags);
170 170
171 return count; 171 return count;
172} 172}