[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-id: <f925862949eb722b15453ab6c053d674147580d3.1301724243.git.len.brown@intel.com>
Date: Sat, 02 Apr 2011 02:22:44 -0400
From: Len Brown <lenb@...nel.org>
To: linux-pm@...ts.linux-foundation.org
Cc: linux-kernel@...r.kernel.org, Len Brown <len.brown@...el.com>,
x86@...nel.org, stable@...nel.org
Subject: [PATCH 02/18] x86 idle floppy: deprecate disable_hlt()
From: Len Brown <len.brown@...el.com>
Plan to remove floppy_disable_hlt in 2.6.40, 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@...nel.org
cc: stable@...nel.org
Signed-off-by: Len Brown <len.brown@...el.com>
---
Documentation/feature-removal-schedule.txt | 8 ++++++++
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 b3f35e5..54db467 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: 2.6.40
+Why: ancient workaround of dubious utility clutters the
+ code used by everybody else.
+Who: Len Brown <len.brown@...el.com>
+
+---------------------------
+
What: PRISM54
When: 2.6.34
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 77fc76f..41ea03f 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 2.6.40");
spin_lock_irqsave(&floppy_hlt_lock, flags);
if (!hlt_disabled) {
hlt_disabled = 1;
--
1.7.5.rc0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists