rpms/kernel/devel linux-2.6-debug-taint-proprietary-helpers.patch, NONE, 1.1 kernel-2.6.spec, 1.1720, 1.1721

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11344

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-debug-taint-proprietary-helpers.patch 
Log Message:
Print debug info in oopses with proprietary helpers loaded.


linux-2.6-debug-taint-proprietary-helpers.patch:
 module.c |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE linux-2.6-debug-taint-proprietary-helpers.patch ---

Kernels that have had Windows drivers loaded into them are
undebuggable.  As we're not interested in those bug reports,
make sure any oopses are marked accordingly.

Signed-off-by: Dave Jones <davej at redhat.com>

--- linux-2.6.14/kernel/module.c~	2005-11-29 16:44:00.000000000 -0500
+++ linux-2.6.14/kernel/module.c	2005-11-29 17:03:55.000000000 -0500
@@ -1723,6 +1723,11 @@ static struct module *load_module(void _
 	/* Set up license info based on the info section */
 	set_license(mod, get_modinfo(sechdrs, infoindex, "license"));
 
+	if (strcmp(mod->name, "ndiswrapper") == 0)
+		add_taint(TAINT_PROPRIETARY_MODULE);
+	if (strcmp(mod->name, "driverloader") == 0)
+		add_taint(TAINT_PROPRIETARY_MODULE);
+
 #ifdef CONFIG_MODULE_UNLOAD
 	/* Set up MODINFO_ATTR fields */
 	setup_modinfo(mod, sechdrs, infoindex);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1720
retrieving revision 1.1721
diff -u -r1.1720 -r1.1721
--- kernel-2.6.spec	29 Nov 2005 15:00:36 -0000	1.1720
+++ kernel-2.6.spec	29 Nov 2005 22:20:49 -0000	1.1721
@@ -278,8 +278,7 @@
 Patch1020: linux-2.6-debug-sleep-in-irq-warning.patch
 Patch1021: linux-2.6-debug-reference-discarded-return-result.patch
 Patch1022: linux-2.6-debug-panic-stackdump.patch
-Patch1023: linux-2.6-ehci-panic.patch
-Patch1024: linux-2.6-valid-ether-addr.patch
+Patch1023: linux-2.6-debug-taint-proprietary-helpers.patch
 
 # Restrict /dev/mem usage.
 Patch1050: linux-2.6-devmem.patch
@@ -337,6 +336,8 @@
 Patch1750: linux-2.6-ub.patch
 Patch1760: linux-2.6-sata-enable-atapi-by-default.patch
 Patch1770: linux-2.6-usb-conexant-extra-id.patch
+Patch1780: linux-2.6-ehci-panic.patch
+Patch1790: linux-2.6-valid-ether-addr.patch
 
 # ACPI patches.
 Patch1800: linux-2.6-acpi-thinkpad-c2c3.patch
@@ -687,7 +688,6 @@
 %patch1021 -p1
 %patch1022 -p1
 %patch1023 -p1
-%patch1024 -p1
 
 #
 # Make /dev/mem a need-to-know function 
@@ -789,6 +789,9 @@
 %patch1760 -p1
 # Extra ID for Conexant USB driver
 %patch1770 -p1
+# USB EHCI spinlock badness fix
+%patch1780 -p1
+%patch1790 -p1
 
 # ACPI patches.
 # Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS.