[kernel/f15] Shutup floppy.c. Abrt files enough bugs as it is (rhbz 749887)

[Josh Boyer]

commit 08e5f6190949d3dc32c6e83c8e2acab7e49ab925
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Fri Oct 28 15:53:11 2011 -0400

    Shutup floppy.c.  Abrt files enough bugs as it is (rhbz 749887)

 floppy-drop-disable_hlt-warning.patch |   13 +++++++++++++
 kernel.spec                           |    7 ++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/floppy-drop-disable_hlt-warning.patch b/floppy-drop-disable_hlt-warning.patch
new file mode 100644
index 0000000..8f0849e
--- /dev/null
+++ b/floppy-drop-disable_hlt-warning.patch
@@ -0,0 +1,13 @@
+diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
+index 9955a53..aef66d1 100644
+--- a/drivers/block/floppy.c
++++ b/drivers/block/floppy.c
+@@ -1038,7 +1038,7 @@ static void floppy_disable_hlt(void)
+ {
+ 	unsigned long flags;
+ 
+-	WARN_ONCE(1, "floppy_disable_hlt() scheduled for removal in 2012");
++	printk(KERN_INFO "floppy_disable_hlt() scheduled for removal in 2012");
+ 	spin_lock_irqsave(&floppy_hlt_lock, flags);
+ 	if (!hlt_disabled) {
+ 		hlt_disabled = 1;
diff --git a/kernel.spec b/kernel.spec
index baa44dd..4e0718b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
 # When changing real_sublevel below, reset this by hand to 1
 # (or to 0 and then use rpmdev-bumpspec).
 #
-%global baserelease 2
+%global baserelease 3
 %global fedora_build %{baserelease}
 
 # real_sublevel is the 3.x kernel version we're starting with
@@ -594,6 +594,7 @@ Patch452: linux-2.6.30-no-pcspkr-modalias.patch
 Patch460: linux-2.6-serial-460800.patch
 
 Patch470: die-floppy-die.patch
+Patch471: floppy-drop-disable_hlt-warning.patch
 
 Patch510: linux-2.6-silence-noise.patch
 Patch530: linux-2.6-silence-fbcon-logo.patch
@@ -1186,6 +1187,7 @@ ApplyPatch linux-2.6-input-kill-stupid-messages.patch
 
 # stop floppy.ko from autoloading during udev...
 ApplyPatch die-floppy-die.patch
+ApplyPatch floppy-drop-disable_hlt-warning.patch
 
 ApplyPatch linux-2.6.30-no-pcspkr-modalias.patch
 
@@ -1919,6 +1921,9 @@ fi
 # and build.
 
 %changelog
+* Fri Oct 28 2011 Josh Boyer <jwboyer at redhat.com>
+- Add patch to prevent tracebacks on a warning in floppy.c (rhbz 749887)
+
 * Wed Oct 26 2011 Josh Boyer <jwboyer at redhat.com> 2.6.40.8-2
 - CVE-2011-4077: xfs: potential buffer overflow in xfs_readlink() (rhbz 749166)