rpms/kernel/devel kernel.spec, 1.22, 1.23 linux-2.6-x86_64-vdso.patch, 1.5, 1.6

[Dave Jones (davej)]

Author: davej

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

Modified Files:
	kernel.spec linux-2.6-x86_64-vdso.patch 
Log Message:
actually, reenable, andi fixed it already.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kernel.spec	20 Jul 2007 20:43:18 -0000	1.22
+++ kernel.spec	20 Jul 2007 20:45:45 -0000	1.23
@@ -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6-x86_64-vdso.patch	20 Jul 2007 20:43:18 -0000	1.5
+++ linux-2.6-x86_64-vdso.patch	20 Jul 2007 20:45:45 -0000	1.6
@@ -106,7 +106,7 @@
 ===================================================================
 --- linux.orig/arch/x86_64/mm/init.c
 +++ linux/arch/x86_64/mm/init.c
-@@ -769,3 +769,12 @@ void *alloc_bootmem_high_node(pg_data_t 
+@@ -774,3 +774,12 @@ void *alloc_bootmem_high_node(pg_data_t 
  	return __alloc_bootmem_core(pgdat->bdata, size,
  			SMP_CACHE_BYTES, (4UL*1024*1024*1024), 0);
  }
@@ -133,9 +133,9 @@
 +#include <linux/version.h>
 +#include <linux/elfnote.h>
 +
-+	/* Supply version information to coredumps */
-+	ELFNOTE(kernelversion, 0, .long, LINUX_VERSION_CODE)
-+	ELFNOTE(os, 0, .asciz, UTS_SYSNAME)
++ELFNOTE_START(Linux, 0, "a")
++	.long LINUX_VERSION_CODE
++ELFNOTE_END
 Index: linux/arch/x86_64/vdso/vdso.lds.S
 ===================================================================
 --- /dev/null
@@ -559,7 +559,7 @@
 ===================================================================
 --- linux.orig/arch/x86_64/Makefile
 +++ linux/arch/x86_64/Makefile
-@@ -79,7 +79,8 @@ head-y := arch/x86_64/kernel/head.o arch
+@@ -76,7 +76,8 @@ head-y := arch/x86_64/kernel/head.o arch
  libs-y 					+= arch/x86_64/lib/
  core-y					+= arch/x86_64/kernel/ \
  					   arch/x86_64/mm/ \
@@ -734,7 +734,7 @@
 ===================================================================
 --- linux.orig/Documentation/kernel-parameters.txt
 +++ linux/Documentation/kernel-parameters.txt
-@@ -1917,7 +1917,7 @@ and is between 256 and 4096 characters. 
+@@ -1880,7 +1880,7 @@ and is between 256 and 4096 characters. 
  	usbhid.mousepoll=
  			[USBHID] The interval which mice are to be polled at.
  
@@ -792,8 +792,10 @@
  	write_sequnlock_irqrestore(&vsyscall_gtod_data.lock, flags);
  }
  
---- linux-2.6.22.noarch/arch/x86_64/kernel/time.c~	2007-07-20 13:46:40.000000000 -0400
-+++ linux-2.6.22.noarch/arch/x86_64/kernel/time.c	2007-07-20 13:46:45.000000000 -0400
+Index: linux/arch/x86_64/kernel/time.c
+===================================================================
+--- linux.orig/arch/x86_64/kernel/time.c
++++ linux/arch/x86_64/kernel/time.c
 @@ -44,6 +44,7 @@
  #include <asm/hpet.h>
  #include <asm/mpspec.h>