rpms/kernel/devel kernel.spec, 1.397, 1.398 linux-2.6-compile-fix-gcc-43.patch, 1.1, 1.2

[Chuck Ebbert (cebbert)]

Author: cebbert

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

Modified Files:
	kernel.spec linux-2.6-compile-fix-gcc-43.patch 
Log Message:
* Fri Feb 01 2008 Chuck Ebbert <cebbert at redhat.com>
- Fix build with GCC 4.3, part 2.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.397
retrieving revision 1.398
diff -u -r1.397 -r1.398
--- kernel.spec	1 Feb 2008 01:28:34 -0000	1.397
+++ kernel.spec	1 Feb 2008 17:45:46 -0000	1.398
@@ -1784,6 +1784,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Fri Feb 01 2008 Chuck Ebbert <cebbert at redhat.com>
+- Fix build with GCC 4.3, part 2.
+
 * Thu Jan 31 2008 Chuck Ebbert <cebbert at redhat.com>
 - Fix build with GCC 4.3
 

linux-2.6-compile-fix-gcc-43.patch:

Index: linux-2.6-compile-fix-gcc-43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-compile-fix-gcc-43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-compile-fix-gcc-43.patch	1 Feb 2008 01:28:34 -0000	1.1
+++ linux-2.6-compile-fix-gcc-43.patch	1 Feb 2008 17:45:46 -0000	1.2
@@ -1,7 +1,3 @@
----
- include/linux/time.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 --- linux-2.6.24.noarch.orig/include/linux/time.h
 +++ linux-2.6.24.noarch/include/linux/time.h
 @@ -169,7 +169,7 @@ extern struct timeval ns_to_timeval(cons
@@ -13,3 +9,30 @@
  {
  	ns += a->tv_nsec;
  	while(unlikely(ns >= NSEC_PER_SEC)) {
+--- a/include/linux/moduleparam.h
++++ b/include/linux/moduleparam.h
+@@ -62,6 +62,15 @@ struct kparam_array
+ 	void *elem;
+ };
+ 
++/* On some platforms relocations to global data cannot go into read-only
++   sections, so 'const' makes no sense and even causes compile failures
++   with some compilers. */
++#if defined(CONFIG_ALPHA) || defined(CONFIG_IA64) || defined(CONFIG_PPC64)
++#define __moduleparam_const
++#else
++#define __moduleparam_const const
++#endif
++
+ /* This is the fundamental function for registering boot/module
+    parameters.  perm sets the visibility in sysfs: 000 means it's
+    not there, read bits mean it's readable, write bits mean it's
+@@ -71,7 +80,7 @@ struct kparam_array
+ 	static int __param_perm_check_##name __attribute__((unused)) =	\
+ 	BUILD_BUG_ON_ZERO((perm) < 0 || (perm) > 0777 || ((perm) & 2));	\
+ 	static const char __param_str_##name[] = prefix #name;		\
+-	static struct kernel_param const __param_##name			\
++	static struct kernel_param __moduleparam_const __param_##name	\
+ 	__attribute_used__						\
+     __attribute__ ((unused,__section__ ("__param"),aligned(sizeof(void *)))) \
+ 	= { __param_str_##name, perm, set, get, { arg } }