[alternative-merged] floppy-revert-floppy-disable-halt-warning.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: floppy: revert floppy disable halt warning
has been removed from the -mm tree.  Its filename was
     floppy-revert-floppy-disable-halt-warning.patch

This patch was dropped because an alternative patch was merged

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
From: Stephen Hemminger <shemminger@xxxxxxxxxx>
Subject: floppy: revert floppy disable halt warning

Remove the stupid floppy disable halt warning.  It is meaningless since
the API is local to floppy driver.  Our boot scripts check for the floppy
drive, and this causes the warning to trigger every time.  This confuses
support, breaks automated tests that look for backtraces on boot, and adds
no value.

The message is being displayed to the wrong audience, it looks like it was
intended as a compromise of a long discussion on LKML about supporting
older x86 hardware; but users don't know or understand what it is saying.

If you want to change halt handling then just fix the floppy driver, don't
whine about it.

Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/block/floppy.c |    1 -
 1 file changed, 1 deletion(-)

diff -puN drivers/block/floppy.c~floppy-revert-floppy-disable-halt-warning drivers/block/floppy.c
--- a/drivers/block/floppy.c~floppy-revert-floppy-disable-halt-warning
+++ a/drivers/block/floppy.c
@@ -1037,7 +1037,6 @@ 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;
_

Patches currently in -mm which might be from shemminger@xxxxxxxxxx are

origin.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux