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>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index b3f35e5f9c95470c96dce361251c3c2275bc2207..5540615ac26c12a5986bdea47bd8fbc6c1fa3c05 100644 (file)
--- 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 77fc76f8aea91b79be3f8cfc6c640e3e23748de0..20aea9b511b5f1cdcecb039af23ab8ca80a66fe9 100644 (file)
--- 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;