[kernel] r6703 - in dists/trunk/linux-2.6/debian/patches: series

[Bastian Blank]

Author: waldi
Date: Thu May 25 17:28:09 2006
New Revision: 6703

Added:
   dists/trunk/linux-2.6/debian/patches/s390-arch-kernel-time.patch   (contents, props changed)
Modified:
   dists/trunk/linux-2.6/debian/patches/series/0experimental.1

Log:
* debian/patches/series/0experimental.1: Enable s390-arch-kernel-time.patch.
* debian/patches/s390-arch-kernel-time.patch: Add.


Added: dists/trunk/linux-2.6/debian/patches/s390-arch-kernel-time.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/s390-arch-kernel-time.patch	Thu May 25 17:28:09 2006
@@ -0,0 +1,13 @@
+diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
+index ce19ad4..07c203b 100644
+--- a/arch/s390/kernel/time.c
++++ b/arch/s390/kernel/time.c
+@@ -272,7 +272,7 @@ static inline void stop_hz_timer(void)
+ 	next = next_timer_interrupt();
+ 	do {
+ 		seq = read_seqbegin_irqsave(&xtime_lock, flags);
+-		timer = (__u64 next) - (__u64 jiffies) + jiffies_64;
++		timer = (__u64) next - (__u64) jiffies + jiffies_64;
+ 	} while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
+ 	todval = -1ULL;
+ 	/* Be careful about overflows. */

Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/0experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/0experimental.1	Thu May 25 17:28:09 2006
@@ -21,4 +21,5 @@
 + s390-drivers-ccw-uevent-modalias.patch
 + s390-drivers-ccw-uevent-cleanup.patch
 + mips-sb1-duart-tts.patch
++ s390-arch-kernel-time.patch
 #FIXME + powerpc-mkvmlinuz-support-2.patch