diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 09:47:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 09:47:56 -0800 |
| commit | 3386c05bdbd3e60ca7158253442f0a00133db28e (patch) | |
| tree | 19e48f0352e65eb83a0e922fb75528ed39f44ebd /arch | |
| parent | 1e70c7f7a9d4a3d2cc78b40e1d7768d99cd79899 (diff) | |
| parent | 6552ebae25ffd57574c6e72d17fce67fea08b918 (diff) | |
| download | linux-3.10-3386c05bdbd3e60ca7158253442f0a00133db28e.tar.gz linux-3.10-3386c05bdbd3e60ca7158253442f0a00133db28e.tar.bz2 linux-3.10-3386c05bdbd3e60ca7158253442f0a00133db28e.zip | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
debugobjects: add and use INIT_WORK_ON_STACK
rcu: remove duplicate CONFIG_RCU_CPU_STALL_DETECTOR
relay: fix lock imbalance in relay_late_setup_files
oprofile: fix uninitialized use of struct op_entry
rcu: move Kconfig menu
softlock: fix false panic which can occur if softlockup_thresh is reduced
rcu: add __cpuinit to rcu_init_percpu_data()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/hpet.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index bb2e0f0975a..64d5ad0b8ad 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -633,6 +633,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); break; case CPU_DEAD: if (hdev) { |