]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
start next 2.6.24 queue with patch for __udivdi3 fix
authorChris Wright <chrisw@sous-sol.org>
Mon, 24 Mar 2008 19:48:22 +0000 (12:48 -0700)
committerChris Wright <chrisw@sous-sol.org>
Mon, 24 Mar 2008 19:48:22 +0000 (12:48 -0700)
queue-2.6.24/series [new file with mode: 0644]
queue-2.6.24/time-prevent-the-loop-in-timespec_add_ns-from-being-optimised-away.patch [new file with mode: 0644]

diff --git a/queue-2.6.24/series b/queue-2.6.24/series
new file mode 100644 (file)
index 0000000..b210f63
--- /dev/null
@@ -0,0 +1 @@
+time-prevent-the-loop-in-timespec_add_ns-from-being-optimised-away.patch
diff --git a/queue-2.6.24/time-prevent-the-loop-in-timespec_add_ns-from-being-optimised-away.patch b/queue-2.6.24/time-prevent-the-loop-in-timespec_add_ns-from-being-optimised-away.patch
new file mode 100644 (file)
index 0000000..489cbda
--- /dev/null
@@ -0,0 +1,32 @@
+From 38332cb98772f5ea757e6486bed7ed0381cb5f98 Mon Sep 17 00:00:00 2001
+From: Segher Boessenkool <segher@kernel.crashing.org>
+Date: Tue, 4 Mar 2008 14:59:54 -0800
+Message-ID: <2d0a357f0803241147o351f9434y696cb33841ffe834@mail.gmail.com>
+Subject: time: prevent the loop in timespec_add_ns() from being optimised away
+
+Since some architectures don't support __udivdi3().
+
+Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
+Cc: john stultz <johnstul@us.ibm.com>
+Cc: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Cc:  Sedat Dilek <sedat.dilek@googlemail.com>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+ include/linux/time.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/include/linux/time.h
++++ b/include/linux/time.h
+@@ -173,6 +173,10 @@ static inline void timespec_add_ns(struc
+ {
+       ns += a->tv_nsec;
+       while(unlikely(ns >= NSEC_PER_SEC)) {
++              /* The following asm() prevents the compiler from
++               * optimising this loop into a modulo operation.  */
++              asm("" : "+r"(ns));
++
+               ns -= NSEC_PER_SEC;
+               a->tv_sec++;
+       }