[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kernel/devel kernel-2.6.spec, 1.1681, 1.1682 linux-2.6-build-nonintconfig.patch, 1.2, 1.3



Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6-build-nonintconfig.patch 
Log Message:
unbreak config generation




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1681
retrieving revision 1.1682
diff -u -r1.1681 -r1.1682
--- kernel-2.6.spec	16 Nov 2005 02:54:02 -0000	1.1681
+++ kernel-2.6.spec	16 Nov 2005 05:13:37 -0000	1.1682
@@ -1299,6 +1299,9 @@
 %endif
 
 %changelog
+* Wed Nov 16 2005 Dave Jones <davej redhat com>
+- Unbreak config generation. HIGHMEM64G works again.
+
 * Tue Nov 15 2005 Dave Jones <davej redhat com>
 - More UB fixing.
 

linux-2.6-build-nonintconfig.patch:
 linux-2.6.14/scripts/kconfig/confdata.c |    8 +++-----
 linux-800/scripts/kconfig/Makefile      |    4 ++++
 linux-800/scripts/kconfig/conf.c        |   26 +++++++++++++++++++++++---
 3 files changed, 30 insertions(+), 8 deletions(-)

Index: linux-2.6-build-nonintconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-build-nonintconfig.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-build-nonintconfig.patch	10 Nov 2005 20:13:24 -0000	1.2
+++ linux-2.6-build-nonintconfig.patch	16 Nov 2005 05:13:37 -0000	1.3
@@ -119,3 +119,32 @@
  				break;
  			} else if (!(sym->flags & SYMBOL_NEW)) {
  				conf_warning("trying to reassign symbol %s", sym->name);
+--- linux-2.6.14/scripts/kconfig/confdata.c~	2005-11-15 23:51:37.000000000 -0500
++++ linux-2.6.14/scripts/kconfig/confdata.c	2005-11-15 23:52:50.000000000 -0500
+@@ -153,7 +153,6 @@ int conf_read_simple(const char *name)
+ 				break;
+ 			} else if (!(sym->flags & SYMBOL_NEW)) {
+ 				conf_warning("trying to reassign symbol %s", sym->name);
+-				break;
+ 			}
+ 			switch (sym->type) {
+ 			case S_BOOLEAN:
+@@ -183,7 +182,6 @@ int conf_read_simple(const char *name)
+ 				break;
+ 			} else if (!(sym->flags & SYMBOL_NEW)) {
+ 				conf_warning("trying to reassign symbol %s", sym->name);
+-				break;
+ 			}
+ 			switch (sym->type) {
+ 			case S_TRISTATE:
+--- linux-2.6.14/scripts/kconfig/confdata.c~	2005-11-16 00:06:16.000000000 -0500
++++ linux-2.6.14/scripts/kconfig/confdata.c	2005-11-16 00:06:40.000000000 -0500
+@@ -254,7 +254,7 @@ int conf_read_simple(const char *name)
+ 					cs->flags |= SYMBOL_NEW;
+ 				} else
+ 					cs->user.val = sym;
+-				break;
++				//break;
+ 			}
+ 			cs->user.tri = E_OR(cs->user.tri, sym->user.tri);
+ 		}


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]