aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorAvik Sil <avik.sil@linaro.org>2011-04-01 15:53:18 +0530
committerAvik Sil <avik.sil@linaro.org>2011-04-01 15:53:18 +0530
commitb500fc733a96f79b4c516b9f3fa1bc7fda630fd0 (patch)
tree82833880aa8a46c99e65b0e0f8c22e0855a0208f /kernel
parent7c2f3276a5912e3aad2038f4ebaf971ff7c12dbe (diff)
downloadlinux-linaro-android-b500fc733a96f79b4c516b9f3fa1bc7fda630fd0.tar.gz
Merge remote branch 'lttng/2.6.38.2-lttng-0.248'
Diffstat (limited to 'kernel')
-rw-r--r--kernel/lockdep.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index ec42bf73455..e0841c537db 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -2439,6 +2439,8 @@ void trace_softirqs_off(unsigned long ip)
{
struct task_struct *curr = current;
+ trace_lockdep_softirqs_off(ip);
+
if (unlikely(!debug_locks))
return;
@@ -2462,8 +2464,6 @@ static void __lockdep_trace_alloc(gfp_t gfp_mask, unsigned long flags)
{
struct task_struct *curr = current;
- trace_lockdep_softirqs_off(ip);
-
if (unlikely(!debug_locks))
return;