diff options
| author | Len Brown <len.brown@intel.com> | 2011-04-01 15:08:48 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-05-29 03:39:15 -0400 |
| commit | 3b70b2e5fcf6315eb833a1bcc2b810bdc75484ff (patch) | |
| tree | 803b88453cf6be96b81727105b67bb7566cf7b48 | |
| parent | 06ae40ce073daf233607a3c54a489f2c1e44683e (diff) | |
| download | linux-3b70b2e5fcf6315eb833a1bcc2b810bdc75484ff.tar.gz | |
x86 idle floppy: deprecate disable_hlt()
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>
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 8 | ||||
| -rw-r--r-- | drivers/block/floppy.c | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index b3f35e5f9c95..5540615ac26c 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt @@ -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 diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 77fc76f8aea9..20aea9b511b5 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -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; |