rpms/kernel/devel kernel.spec, 1.21, 1.22 linux-2.6-x86_64-vdso.patch, 1.4, 1.5

[Dave Jones (davej)]

Author: davej

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

Modified Files:
	kernel.spec linux-2.6-x86_64-vdso.patch 
Log Message:
drop vdso patch for now, rediff later


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kernel.spec	20 Jul 2007 20:38:04 -0000	1.21
+++ kernel.spec	20 Jul 2007 20:43:18 -0000	1.22
@@ -1083,7 +1083,7 @@
 # Suppress APIC errors on UP x86-64.
 #ApplyPatch linux-2.6-x86_64-silence-up-apic-errors.patch
 # Add vDSO for x86-64 with gettimeofday/clock_gettime/getcpu
-ApplyPatch linux-2.6-x86_64-vdso.patch
+#ApplyPatch linux-2.6-x86_64-vdso.patch
 
 #
 # PowerPC

linux-2.6-x86_64-vdso.patch:

Index: linux-2.6-x86_64-vdso.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-x86_64-vdso.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-x86_64-vdso.patch	20 Jul 2007 20:22:55 -0000	1.4
+++ linux-2.6-x86_64-vdso.patch	20 Jul 2007 20:43:18 -0000	1.5
@@ -134,8 +134,8 @@
 +#include <linux/elfnote.h>
 +
 +	/* Supply version information to coredumps */
-+	ELFNOTE(kernelversion, 0, LINUX_VERSION_CODE)
-+	ELFNOTE(os, 0, UTS_SYSNAME)
++	ELFNOTE(kernelversion, 0, .long, LINUX_VERSION_CODE)
++	ELFNOTE(os, 0, .asciz, UTS_SYSNAME)
 Index: linux/arch/x86_64/vdso/vdso.lds.S
 ===================================================================
 --- /dev/null