rpms/kernel/devel kernel.spec, 1.542, 1.543 linux-2.6-compile-fix-gcc-43.patch, 1.5, 1.6

[Chuck Ebbert (cebbert)]

Author: cebbert

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

Modified Files:
	kernel.spec linux-2.6-compile-fix-gcc-43.patch 
Log Message:
* Wed Mar 26 2008 Chuck Ebbert <cebbert at redhat.com>
- Remove a now unnecessary gcc43 compile fix.
- Apply compile fixes to vanilla kernels.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -r1.542 -r1.543
--- kernel.spec	26 Mar 2008 18:06:15 -0000	1.542
+++ kernel.spec	26 Mar 2008 19:05:29 -0000	1.543
@@ -557,6 +557,10 @@
 # we always need nonintconfig, even for -vanilla kernels
 Patch06: linux-2.6-build-nonintconfig.patch
 
+# we also need compile fixes for -vanilla
+Patch07: linux-2.6-compile-fixes.patch
+Patch08: linux-2.6-compile-fix-gcc-43.patch
+
 %if !%{nopatches}
 
 Patch10: linux-2.6-hotfixes.patch
@@ -608,8 +612,6 @@
 Patch683: linux-2.6-iwlwifi-sband-registration.patch
 Patch690: linux-2.6-at76.patch
 
-Patch820: linux-2.6-compile-fixes.patch
-Patch821: linux-2.6-compile-fix-gcc-43.patch
 Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch
 Patch1400: linux-2.6-smarter-relatime.patch
 Patch1515: linux-2.6-lirc.patch
@@ -965,6 +967,17 @@
 # builds (as used in the buildsystem).
 ApplyPatch linux-2.6-build-nonintconfig.patch
 
+#
+# misc small stuff to make things compile
+#
+C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-compile-fixes.patch | awk '{print $1}')
+if [ "$C" -gt 10 ]; then
+ApplyPatch linux-2.6-compile-fixes.patch
+fi
+
+# build with gcc43
+ApplyPatch linux-2.6-compile-fix-gcc-43.patch
+
 %if !%{nopatches}
 
 ApplyPatch linux-2.6-hotfixes.patch
@@ -1102,18 +1115,6 @@
 # implement smarter atime updates support.
 ApplyPatch linux-2.6-smarter-relatime.patch
 
-#
-# misc small stuff to make things compile
-#
-
-C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-compile-fixes.patch | awk '{print $1}')
-if [ "$C" -gt 10 ]; then
-ApplyPatch linux-2.6-compile-fixes.patch
-fi
-
-# build with gcc43
-ApplyPatch linux-2.6-compile-fix-gcc-43.patch
-
 # build id related enhancements
 ApplyPatch linux-2.6-default-mmf_dump_elf_headers.patch
 
@@ -1744,6 +1745,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Wed Mar 26 2008 Chuck Ebbert <cebbert at redhat.com>
+- Remove a now unnecessary gcc43 compile fix.
+- Apply compile fixes to vanilla kernels.
+
 * Wed Mar 26 2008 David Woodhouse <dwmw2 at redhat.com>
 - Link PowerPC zImage at 32MiB (#239658 on POWER5, also fixes Efika)
 

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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-compile-fix-gcc-43.patch	15 Feb 2008 20:40:46 -0000	1.5
+++ linux-2.6-compile-fix-gcc-43.patch	26 Mar 2008 19:05:29 -0000	1.6
@@ -1,14 +1,3 @@
---- 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
-  * @a:		pointer to timespec to be incremented
-  * @ns:		unsigned nanoseconds value to be added
-  */
--static inline void timespec_add_ns(struct timespec *a, u64 ns)
-+static inline void timespec_add_ns(struct timespec *a, volatile u64 ns)
- {
- 	ns += a->tv_nsec;
- 	while(unlikely(ns >= NSEC_PER_SEC)) {
 --- a/include/linux/module.h
 +++ b/include/linux/module.h
 @@ -30,6 +30,15 @@