summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/common-t3.c
diff options
context:
space:
mode:
authorNitin Kumbhar <nkumbhar@nvidia.com>2011-10-21 18:20:13 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:49:30 -0800
commitccf269e87521b6b6c593a9949c2debc21b61f63d (patch)
treec159ada7a6fbf94b2c78630279fcf8940ecb01da /arch/arm/mach-tegra/common-t3.c
parentc2db6cea0d0e26575a2719420f333d7b3fd78ab2 (diff)
arm: tegra: use non-blocking api to cancel work from mc error isr
An api (del_timer_sync), which can sleep, should not be used in hardirq context. This gives warnings for potential deadlock. Use non-sleeping api to cancel the work instead. In this case, if the work is already running, it would unthrottle mc error prints. BUG 889717 Change-Id: I4c0205766d82a45a04d1c0125bb8ed5927757456 Reviewed-on: http://git-master/r/59604 Tested-by: Nitin Kumbhar <nkumbhar@nvidia.com> Reviewed-by: Scott Williams <scwilliams@nvidia.com> Reviewed-by: Krishna Reddy <vdumpa@nvidia.com> Reviewed-by: Prajakta Gudadhe <pgudadhe@nvidia.com> Rebase-Id: R713c536217d0169f395ffb199ec2a97b274b9914
Diffstat (limited to 'arch/arm/mach-tegra/common-t3.c')
-rw-r--r--arch/arm/mach-tegra/common-t3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/common-t3.c b/arch/arm/mach-tegra/common-t3.c
index 17a26c202c9b..d13b3bbe5d22 100644
--- a/arch/arm/mach-tegra/common-t3.c
+++ b/arch/arm/mach-tegra/common-t3.c
@@ -133,7 +133,7 @@ static irqreturn_t tegra_mc_error_isr(int irq, void *data)
MC_INT_SECURITY_VIOLATION |
MC_INT_INVALID_SMMU_PAGE);
- cancel_delayed_work(&unthrottle_prints_work);
+ __cancel_delayed_work(&unthrottle_prints_work);
spin_lock(&mc_lock);
count = ++error_count;