rpms/kernel/devel linux-2.6-powerpc-gettimeofday.patch, NONE, 1.1 patch-2.6.16-rc5-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.365, 1.366 kernel-2.6.spec, 1.1993, 1.1994 sources, 1.307, 1.308 upstream, 1.282, 1.283 linux-2.6.15-powerpc-gettimeofday.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Feb 28 20:48:20 UTC 2006 

Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	linux-2.6-powerpc-gettimeofday.patch 
	patch-2.6.16-rc5-git3.bz2.sign 
Removed Files:
	linux-2.6.15-powerpc-gettimeofday.patch 
Log Message:
git3


linux-2.6-powerpc-gettimeofday.patch:
 gettimeofday.S |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-powerpc-gettimeofday.patch ---
>From benh at kernel.crashing.org Sat Feb 25 21:11:28 2006
Return-path: <benh at kernel.crashing.org>
Envelope-to: dwmw2 at baythorne.infradead.org
Delivery-date: Sat, 25 Feb 2006 21:11:28 +0000
Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by
	baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
	1FD6hM-0006Jj-Lv for dwmw2 at baythorne.infradead.org; Sat, 25 Feb 2006
	21:11:28 +0000
Received: from [2002:3fe4:139::1] (helo=gate.crashing.org) by
	pentafluge.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id
	1FD6hJ-0008Dl-05 for dwmw2 at infradead.org; Sat, 25 Feb 2006 21:11:28 +0000
Received: from localhost.localdomain (localhost [127.0.0.1]) by
	gate.crashing.org (8.12.8/8.12.8) with ESMTP id k1PKxQWG030049; Sat, 25 Feb
	2006 14:59:27 -0600
Subject: [PATCH] powerpc: vdso 64bits gettimeofday bug
From: Benjamin Herrenschmidt <benh at kernel.crashing.org>
To: Andrew Morton <akpm at osdl.org>, Linus Torvalds <torvalds at osdl.org>
Cc: Paul Mackerras <paulus at samba.org>, Olaf Hering <olh at suse.de>, linuxppc-dev list <linuxppc-dev at ozlabs.org>, linuxppc64-dev <linuxppc64-dev at ozlabs.org>, Greg KH <greg at kroah.com>, David Woodhouse <dwmw2 at infradead.org>, Sven Luther <sven.luther at wanadoo.fr>
Content-Type: text/plain
Date: Sun, 26 Feb 2006 08:09:00 +1100
Message-Id: <1140901740.24957.29.camel at localhost.localdomain>
Mime-Version: 1.0
X-Mailer: Evolution 2.5.91 
X-Spam-Score: -2.8 (--)
X-Spam-Report: SpamAssassin version 3.0.4 on pentafluge.infradead.org
	summary: Content analysis details:   (-2.8 points, 5.0 required) pts rule
	name              description ---- ----------------------
	-------------------------------------------------- -2.8 ALL_TRUSTED        
	   Did not pass through any untrusted hosts
X-Evolution-Source: imap://dwmw2@pentafluge.infradead.org/
Content-Transfer-Encoding: 8bit

A bug in the assembly code of the vdso can cause gettimeofday() to hang
or to return incorrect results. The wrong register was used to test for
pending updates of the calibration variables and to create a dependency
for subsequent loads. This fixes it.

Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
---

Might be worth applying to the stable series too and/or distro kernels
2.6.15 and later

--- linux-work.orig/arch/powerpc/kernel/vdso64/gettimeofday.S	2006-02-26 08:02:57.000000000 +1100
+++ linux-work/arch/powerpc/kernel/vdso64/gettimeofday.S	2006-02-26 08:04:23.000000000 +1100
@@ -225,9 +225,9 @@
   .cfi_startproc
 	/* check for update count & load values */
 1:	ld	r8,CFG_TB_UPDATE_COUNT(r3)
-	andi.	r0,r4,1			/* pending update ? loop */
+	andi.	r0,r8,1			/* pending update ? loop */
 	bne-	1b
-	xor	r0,r4,r4		/* create dependency */
+	xor	r0,r8,r8		/* create dependency */
 	add	r3,r3,r0
 
 	/* Get TB & offset it */




--- NEW FILE patch-2.6.16-rc5-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBEBJ5myGugalF9Dw4RAleFAJ9dmng5HquMqmnJX02okApb2M9oswCfVnSK
UXog9AcSsuoTLplt3oDZXbo=
=jsjS
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -r1.365 -r1.366
--- .cvsignore	27 Feb 2006 21:42:33 -0000	1.365
+++ .cvsignore	28 Feb 2006 20:48:17 -0000	1.366
@@ -4,4 +4,4 @@
 linux-2.6.15.tar.bz2
 xen-20060208.tar.bz2
 patch-2.6.16-rc5.bz2
-patch-2.6.16-rc5-git1.bz2
+patch-2.6.16-rc5-git3.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1993
retrieving revision 1.1994
diff -u -r1.1993 -r1.1994
--- kernel-2.6.spec	28 Feb 2006 16:28:16 -0000	1.1993
+++ kernel-2.6.spec	28 Feb 2006 20:48:17 -0000	1.1994
@@ -218,7 +218,7 @@
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
 Patch1: patch-2.6.16-rc5.bz2
-Patch2: patch-2.6.16-rc5-git1.bz2
+Patch2: patch-2.6.16-rc5-git3.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -238,7 +238,7 @@
 # 300 - 399   ppc(64)
 Patch300: linux-2.6-powermac-pfunc-noise.patch
 Patch301: linux-2.6-cell-numa-init.patch
-Patch302: linux-2.6.15-powerpc-gettimeofday.patch
+Patch302: linux-2.6-powerpc-gettimeofday.patch
 Patch305: linux-2.6-cell-mambo-drivers.patch
 Patch306: linux-2.6-hvc-console.patch
 Patch310: linux-2.6-cell-spiderpic-no-devtree.patch
@@ -1585,9 +1585,15 @@
 %endif
 
 %changelog
+<<<<<<< kernel-2.6.spec
+* Tue Feb 28 2006 Dave Jones <davej at redhat.com>
+- 2.6.16rc5-git3
+
+=======
 * Tue Feb 28 2006 David Woodhouse <dwmw2 at redhat.com>
 - Fix gettimeofday() in the 64-bit PowerPC vDSO
 
+>>>>>>> 1.1993
 * Mon Feb 27 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc5 & rc5-git1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- sources	27 Feb 2006 21:42:33 -0000	1.307
+++ sources	28 Feb 2006 20:48:17 -0000	1.308
@@ -1,4 +1,4 @@
 cdf95e00f5111e31f78e1d97304d9522  linux-2.6.15.tar.bz2
 30f4ef37dbc4d0bce9366e8716e8b51b  xen-20060208.tar.bz2
 1740ae34807f687a93adf2469ea5c4fc  patch-2.6.16-rc5.bz2
-45d08cf9db21b2be6d13b4a27bb65196  patch-2.6.16-rc5-git1.bz2
+a1b2a5ce9754f7f778490eaf47ef0e92  patch-2.6.16-rc5-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- upstream	27 Feb 2006 21:42:33 -0000	1.282
+++ upstream	28 Feb 2006 20:48:17 -0000	1.283
@@ -1,3 +1,3 @@
 linux-2.6.15.tar.bz2
 patch-2.6.16-rc5.bz2
-patch-2.6.16-rc5-git1.bz2
+patch-2.6.16-rc5-git3.bz2


--- linux-2.6.15-powerpc-gettimeofday.patch DELETED ---

More information about the fedora-cvs-commits mailing list