rpms/kernel/devel linux-2.6-modules-ignore-whitespace.patch, NONE, 1.1 kernel-2.6.spec, 1.1463, 1.1464

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-modules-ignore-whitespace.patch 
Log Message:
Add new patch to deal with the 'white space at eol of modprobe.conf' bug.
(This one doesn't ignore obsolete parameters).




linux-2.6-modules-ignore-whitespace.patch:
 params.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

--- NEW FILE linux-2.6-modules-ignore-whitespace.patch ---

The patch titled

     Ignore trailing whitespace on kernel parameters correctly

has been added to the -mm tree.  Its filename is

     ignore-trailing-whitespace-on-kernel-parameters-correctly.patch

Patches currently in -mm which might be from rusty at rustcorp.com.au are

flush-icache-early-when-loading-module.patch
ignore-trailing-whitespace-on-kernel-parameters-correctly.patch
update-documentation-docbook-kernel-hackingtmpl.patch
merge-some-from-rustys-trivial-patches.patch



From: Rusty Russell <rusty at rustcorp.com.au>

Dave Jones says:

... if the modprobe.conf has trailing whitespace, modules fail to load
with the following helpful message..

	snd_intel8x0: Unknown parameter `'

Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Cc: Dave Jones <davej at codemonkey.org.uk>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 kernel/params.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff -puN kernel/params.c~ignore-trailing-whitespace-on-kernel-parameters-correctly kernel/params.c
--- devel/kernel/params.c~ignore-trailing-whitespace-on-kernel-parameters-correctly	2005-08-08 22:53:16.000000000 -0700
+++ devel-akpm/kernel/params.c	2005-08-08 22:53:57.000000000 -0700
@@ -135,11 +135,8 @@ int parse_args(const char *name,
 
 	DEBUGP("Parsing ARGS: %s\n", args);
 
-	while (*args) {
-		int ret;
-
-		args = next_arg(args, &param, &val);
-		ret = parse_one(param, val, params, num, unknown);
+	while (*(args = next_arg(args, &param, &val))) {
+		int ret = parse_one(param, val, params, num, unknown);
 		switch (ret) {
 		case -ENOENT:
 			printk(KERN_ERR "%s: Unknown parameter `%s'\n",
_



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1463
retrieving revision 1.1464
diff -u -r1.1463 -r1.1464
--- kernel-2.6.spec	9 Aug 2005 05:51:53 -0000	1.1463
+++ kernel-2.6.spec	9 Aug 2005 06:05:41 -0000	1.1464
@@ -327,6 +327,7 @@
 Patch1710: linux-2.6.11-parport-sysctl-perms.patch
 Patch1720: linux-2.6.11-libata-promise-pata-on-sata.patch
 Patch1730: linux-2.6.12-input-kill-stupid-messages.patch
+Patch1740: linux-2.6-modules-ignore-whitespace.patch
 Patch1750: linux-2.6.11-serial-tickle-nmi.patch
 Patch1760: linux-2.6.12-missing-exports.patch
 Patch1770: linux-2.6.11-radeon-backlight.patch
@@ -722,6 +723,8 @@
 %patch1720 -p1
 # The input layer spews crap no-one cares about.
 %patch1730 -p1
+# Ignore whitespace at the EOL in modprobe.conf
+%patch1740 -p1
 # Tickle the NMI whilst doing serial writes.
 %patch1750 -p1
 # Missing EXPORT_SYMBOL's
@@ -1189,6 +1192,8 @@
 * Tue Aug 09 2005 Dave Jones <davej at redhat.com>
 - Improve the spinlock debugging panic code.
   (Worse case, users can now boot with 'dontpanic')
+- Add new patch to deal with the 'white space at eol of modprobe.conf' bug.
+  (This one doesn't ignore obsolete parameters).
 
 * Mon Aug 08 2005 Dave Jones <davej at redhat.com>
 - Various specfile cleanup.