Skip to content

Commit

Permalink
x86 idle floppy: deprecate disable_hlt()
Browse files Browse the repository at this point in the history
Plan to remove floppy_disable_hlt in 2012, an ancient
workaround with comments that it should be removed.

This allows us to remove clutter and a run-time branch
from the idle code.

WARN_ONCE() on invocation until it is removed.

cc: x86@kernel.org
cc: stable@kernel.org # .39.x
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Len Brown committed May 29, 2011
1 parent 06ae40c commit 3b70b2e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
8 changes: 8 additions & 0 deletions Documentation/feature-removal-schedule.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ be removed from this file.

---------------------------

What: x86 floppy disable_hlt
When: 2012
Why: ancient workaround of dubious utility clutters the
code used by everybody else.
Who: Len Brown <len.brown@intel.com>

---------------------------

What: PRISM54
When: 2.6.34

Expand Down
1 change: 1 addition & 0 deletions drivers/block/floppy.c
Original file line number Diff line number Diff line change
Expand Up @@ -1038,6 +1038,7 @@ static void floppy_disable_hlt(void)
{
unsigned long flags;

WARN_ONCE(1, "floppy_disable_hlt() scheduled for removal in 2012");
spin_lock_irqsave(&floppy_hlt_lock, flags);
if (!hlt_disabled) {
hlt_disabled = 1;
Expand Down

0 comments on commit 3b70b2e

Please sign in to comment.