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;