diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-29 14:18:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-29 14:18:09 -0400 |
| commit | f310642123e0d32d919c60ca3fab5acd130c4ba3 (patch) | |
| tree | f3844152e2e8c0fdd01621a400f84c8a159252a0 /drivers/block | |
| parent | ef1d57599dc904fdb31b8e9b5336350d21a1fde1 (diff) | |
| parent | 5d4c47e0195b989f284907358bd5c268a44b91c7 (diff) | |
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
x86 idle: deprecate mwait_idle() and "idle=mwait" cmdline param
x86 idle: deprecate "no-hlt" cmdline param
x86 idle APM: deprecate CONFIG_APM_CPU_IDLE
x86 idle floppy: deprecate disable_hlt()
x86 idle: EXPORT_SYMBOL(default_idle, pm_idle) only when APM demands it
x86 idle: clarify AMD erratum 400 workaround
idle governor: Avoid lock acquisition to read pm_qos before entering idle
cpuidle: menu: fixed wrapping timers at 4.294 seconds
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/floppy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index db8f88586c8d..98de8f418676 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
| @@ -1038,6 +1038,7 @@ static void floppy_disable_hlt(void) | |||
| 1038 | { | 1038 | { |
| 1039 | unsigned long flags; | 1039 | unsigned long flags; |
| 1040 | 1040 | ||
| 1041 | WARN_ONCE(1, "floppy_disable_hlt() scheduled for removal in 2012"); | ||
| 1041 | spin_lock_irqsave(&floppy_hlt_lock, flags); | 1042 | spin_lock_irqsave(&floppy_hlt_lock, flags); |
| 1042 | if (!hlt_disabled) { | 1043 | if (!hlt_disabled) { |
| 1043 | hlt_disabled = 1; | 1044 | hlt_disabled = 1; |