rpms/kernel/devel config-generic, 1.120, 1.121 kernel.spec, 1.728, 1.729 linux-2.6-silence-noise.patch, 1.15, 1.16

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21570

Modified Files:
	config-generic kernel.spec linux-2.6-silence-noise.patch 
Log Message:
* Thu Jul  3 2008 Jeremy Katz <katzj at redhat.com>
- Disable the garmin_gps driver; programs are using libusb for this now
- Make padlock warnings quieter



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- config-generic	3 Jul 2008 03:17:44 -0000	1.120
+++ config-generic	3 Jul 2008 04:21:56 -0000	1.121
@@ -2690,7 +2690,7 @@
 CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_GARMIN=m
+# CONFIG_USB_SERIAL_GARMIN is not set
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_IPAQ=m
 CONFIG_USB_SERIAL_IPW=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.728
retrieving revision 1.729
diff -u -r1.728 -r1.729
--- kernel.spec	3 Jul 2008 03:17:44 -0000	1.728
+++ kernel.spec	3 Jul 2008 04:21:56 -0000	1.729
@@ -1788,6 +1788,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Thu Jul  3 2008 Jeremy Katz <katzj at redhat.com>
+- Disable the garmin_gps driver; programs are using libusb for this now
+- Make padlock warnings quieter
+
 * Wed Jul 02 2008 Chuck Ebbert <cebbert at redhat.com>
 - Re-enable the snd-pcsp driver (#452748)
 

linux-2.6-silence-noise.patch:

Index: linux-2.6-silence-noise.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-silence-noise.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- linux-2.6-silence-noise.patch	16 May 2008 21:06:38 -0000	1.15
+++ linux-2.6-silence-noise.patch	3 Jul 2008 04:21:56 -0000	1.16
@@ -88,3 +88,60 @@
  	mutex_lock(&dpm_list_mtx);
  	if ((dev->parent && dev->parent->power.sleeping) || all_sleeping) {
  		if (dev->parent->power.sleeping)
+From fc4c74c4d0ccc7b57fcc841e88b63fd729f45115 Mon Sep 17 00:00:00 2001
+From: Jeremy Katz <katzj at redhat.com>
+Date: Tue, 1 Jul 2008 17:32:41 -0400
+Subject: [PATCH] Make loading padlock modules quieter when hardware isn't available
+
+When loading aes or sha256 via the module aliases, the padlock modules
+also try to get loaded.  Make the error message for them not being
+present only be a NOTICE rather than an ERROR so that use of 'quiet'
+will suppress the messages
+
+Signed-off-by: Jeremy Katz <katzj at redhat.com>
+---
+ drivers/crypto/padlock-aes.c |    4 ++--
+ drivers/crypto/padlock-sha.c |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
+index bb30eb9..54a2a16 100644
+--- a/drivers/crypto/padlock-aes.c
++++ b/drivers/crypto/padlock-aes.c
+@@ -385,12 +385,12 @@ static int __init padlock_init(void)
+ 	int ret;
+ 
+ 	if (!cpu_has_xcrypt) {
+-		printk(KERN_ERR PFX "VIA PadLock not detected.\n");
++		printk(KERN_NOTICE PFX "VIA PadLock not detected.\n");
+ 		return -ENODEV;
+ 	}
+ 
+ 	if (!cpu_has_xcrypt_enabled) {
+-		printk(KERN_ERR PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n");
++		printk(KERN_NOTICE PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n");
+ 		return -ENODEV;
+ 	}
+ 
+diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c
+index c666b4e..40d5680 100644
+--- a/drivers/crypto/padlock-sha.c
++++ b/drivers/crypto/padlock-sha.c
+@@ -254,12 +254,12 @@ static int __init padlock_init(void)
+ 	int rc = -ENODEV;
+ 
+ 	if (!cpu_has_phe) {
+-		printk(KERN_ERR PFX "VIA PadLock Hash Engine not detected.\n");
++		printk(KERN_NOTICE PFX "VIA PadLock Hash Engine not detected.\n");
+ 		return -ENODEV;
+ 	}
+ 
+ 	if (!cpu_has_phe_enabled) {
+-		printk(KERN_ERR PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n");
++		printk(KERN_NOTICE PFX "VIA PadLock detected, but not enabled. Hmm, strange...\n");
+ 		return -ENODEV;
+ 	}
+ 
+-- 
+1.5.6
+