From: tip-bot for Thomas Gleixner <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
vincent.weaver@maine.edu, tglx@linutronix.de
Subject: [tip:timers/core] x86: hpet: Use proper destructor for delayed work
Date: Tue, 25 Mar 2014 09:37:38 -0700 [thread overview]
Message-ID: <tip-b712c8dae05931a76b6c17a4254f403798e6caef@git.kernel.org> (raw)
In-Reply-To: <20140323141940.034005322@linutronix.de>
Commit-ID: b712c8dae05931a76b6c17a4254f403798e6caef
Gitweb: http://git.kernel.org/tip/b712c8dae05931a76b6c17a4254f403798e6caef
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Sun, 23 Mar 2014 14:20:45 +0000
Committer: Thomas Gleixner <tglx@linutronix.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@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: x86@kernel.org
Link: http://lkml.kernel.org/r/20140323141940.034005322@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.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) {
prev parent reply other threads:[~2014-03-25 16:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-23 14:20 [patch 0/2] workqueue: Add proper debugobjects support for delayed_work on stack Thomas Gleixner
2014-03-23 14:20 ` [patch 1/2] workqueue: Provide destroy_delayed_work_on_stack() Thomas Gleixner
2014-03-24 12:51 ` Tejun Heo
2014-03-25 16:37 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2014-03-23 14:20 ` [patch 2/2] x86: hpet: Use proper destructor for delayed work Thomas Gleixner
2014-03-25 16:37 ` tip-bot for Thomas Gleixner [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-b712c8dae05931a76b6c17a4254f403798e6caef@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=vincent.weaver@maine.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.