rpms/kernel/devel kernel-2.6.spec, 1.1489, 1.1490 linux-2.6-modules-ignore-whitespace.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-modules-ignore-whitespace.patch 
Log Message:
- Fix up the 'last item on the boot cmdline gets eaten' bug.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1489
retrieving revision 1.1490
diff -u -r1.1489 -r1.1490
--- kernel-2.6.spec	18 Aug 2005 05:28:13 -0000	1.1489
+++ kernel-2.6.spec	18 Aug 2005 05:30:52 -0000	1.1490
@@ -1182,6 +1182,7 @@
 %changelog
 * Thu Aug 18 2005 Dave Jones <davej at redhat.com>
 - 2.6.13-rc6-git9
+- Fix up the 'last item on the boot cmdline gets eaten' bug.
 
 * Tue Aug 16 2005 Dave Jones <davej at redhat.com>
 - 2.6.13-rc6-git8

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

Index: linux-2.6-modules-ignore-whitespace.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-modules-ignore-whitespace.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-modules-ignore-whitespace.patch	9 Aug 2005 06:05:53 -0000	1.1
+++ linux-2.6-modules-ignore-whitespace.patch	18 Aug 2005 05:31:09 -0000	1.2
@@ -1,22 +1,6 @@
 
-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>
+Name: Ignore trailing whitespace on kernel parameters correctly: Fixed version
+Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
 
 Dave Jones says:
 
@@ -25,30 +9,40 @@
 
 	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,
+Previous version truncated last argument.
+
+Index: linux-2.6.13-rc6-git7-Module/kernel/params.c
+===================================================================
+--- linux-2.6.13-rc6-git7-Module.orig/kernel/params.c	2005-08-10 16:12:45.000000000 +1000
++++ linux-2.6.13-rc6-git7-Module/kernel/params.c	2005-08-16 14:31:16.000000000 +1000
+@@ -80,8 +80,6 @@
+ 	int in_quote = 0, quoted = 0;
+ 	char *next;
+ 
+-	/* Chew any extra spaces */
+-	while (*args == ' ') args++;
+ 	if (*args == '"') {
+ 		args++;
+ 		in_quote = 1;
+@@ -121,6 +119,9 @@
+ 		next = args + i + 1;
+ 	} else
+ 		next = args + i;
++
++	/* Chew up trailing spaces. */
++	while (*next == ' ') next++;
+ 	return next;
+ }
+ 
+@@ -134,6 +135,9 @@
+ 	char *param, *val;
  
  	DEBUGP("Parsing ARGS: %s\n", args);
++	
++	/* Chew leading spaces */
++	while (*args == ' ') 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",
-_
+ 	while (*args) {
+ 		int ret;
+