]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
signed vs. unsigned fix for UML uptime from Jeff Dike
authorChris Wright <chrisw@sous-sol.org>
Tue, 20 Jun 2006 22:57:29 +0000 (15:57 -0700)
committerChris Wright <chrisw@sous-sol.org>
Tue, 20 Jun 2006 22:57:29 +0000 (15:57 -0700)
queue-2.6.17/series
queue-2.6.17/uml-fix-uptime.patch [new file with mode: 0644]

index 9563fb65991a7e839d7e4a171edc1f9f6559d392..22ac34daadcbaf6eed2396f7fcfd97ada4081f3e 100644 (file)
@@ -12,3 +12,4 @@ sparc32-fix-iommu_flush_iotlb-end-address.patch
 ntfs-critical-bug-fix.patch
 x86-compile-fix-for-asm-i386-alternatives.h.patch
 bcm43xx-init-fix-for-possible-machine-check.patch
+uml-fix-uptime.patch
diff --git a/queue-2.6.17/uml-fix-uptime.patch b/queue-2.6.17/uml-fix-uptime.patch
new file mode 100644 (file)
index 0000000..0141c5f
--- /dev/null
@@ -0,0 +1,29 @@
+From stable-bounces@linux.kernel.org  Tue Jun 20 15:25:45 2006
+Date: Tue, 20 Jun 2006 18:25:03 -0400
+From: Jeff Dike <jdike@addtoit.com>
+To: stable@kernel.org
+Cc: linux-kernel@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net
+Subject: UML: fix uptime
+
+The use of signed instead of unsigned here broke the calculations on
+negative numbers that are involved in calculating wall_to_monotonic.
+
+Signed-off-by: Jeff Dike <jdike@addtoit.com>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+---
+ arch/um/kernel/time_kern.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.17.1.orig/arch/um/kernel/time_kern.c
++++ linux-2.6.17.1/arch/um/kernel/time_kern.c
+@@ -87,7 +87,7 @@ void timer_irq(union uml_pt_regs *regs)
+ void time_init_kern(void)
+ {
+-      unsigned long long nsecs;
++      long long nsecs;
+       nsecs = os_nsecs();
+       set_normalized_timespec(&wall_to_monotonic, -nsecs / BILLION,