lkml.org 
[lkml]   [2011]   [Apr]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/18] x86 idle floppy: deprecate disable_hlt()
    Date
    From: Len Brown <len.brown@intel.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@kernel.org
    cc: stable@kernel.org
    Signed-off-by: Len Brown <len.brown@intel.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@intel.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


    \
     
     \ /
      Last update: 2011-04-02 08:27    [W:0.029 / U:0.024 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site