[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-b712c8dae05931a76b6c17a4254f403798e6caef@git.kernel.org>
Date: Tue, 25 Mar 2014 09:37:38 -0700
From: tip-bot for Thomas Gleixner <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
vincent.weaver@...ne.edu, tglx@...utronix.de
Subject: [tip:timers/core] x86: hpet:
Use proper destructor for delayed work
Commit-ID: b712c8dae05931a76b6c17a4254f403798e6caef
Gitweb: http://git.kernel.org/tip/b712c8dae05931a76b6c17a4254f403798e6caef
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Sun, 23 Mar 2014 14:20:45 +0000
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Tue, 25 Mar 2014 17:34:01 +0100
x86: hpet: Use proper destructor for delayed work
destroy_timer_on_stack() is hardly the right thing for a delayed
work. We leak a tracking object for the work itself when DEBUG_OBJECTS
is enabled.
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Cc: Vince Weaver <vincent.weaver@...ne.edu>
Cc: x86@...nel.org
Link: http://lkml.kernel.org/r/20140323141940.034005322@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
arch/x86/kernel/hpet.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index da85a8e..b91abfd 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -699,7 +699,7 @@ static int hpet_cpuhp_notify(struct notifier_block *n,
/* FIXME: add schedule_work_on() */
schedule_delayed_work_on(cpu, &work.work, 0);
wait_for_completion(&work.complete);
- destroy_timer_on_stack(&work.work.timer);
+ destroy_delayed_work_on_stack(&work.work);
break;
case CPU_DEAD:
if (hdev) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists