diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-03-23 14:20:45 +0000 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-03-25 17:34:01 +0100 |
commit | b712c8dae05931a76b6c17a4254f403798e6caef (patch) | |
tree | c4ad7690e81e3c182fe7387b19fbe9ebe0270472 /arch/x86/kernel/hpet.c | |
parent | ea2e64f280d2a34a8ed9ae3d783cd770d14b70ec (diff) | |
download | linux-b712c8dae05931a76b6c17a4254f403798e6caef.tar.bz2 |
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>
Diffstat (limited to 'arch/x86/kernel/hpet.c')
-rw-r--r-- | arch/x86/kernel/hpet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index da85a8e830a1..b91abfdd4931 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) { |