[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, debian, updated. upstream/20081103.git7172ec57-33-gf7217f2

[Luca Capello]

The following commit has been merged in the debian branch:
commit f7217f21d54920563463b9f2e20a68dd70fecd40
Author: Luca Capello <luca at pca.it>
Date:   Wed Nov 12 18:32:36 2008 +0100

    debian/patches/01_fix-timespec_add_ns-in-time.h.patch: remove

diff --git a/debian/changelog b/debian/changelog
index 59e2cfa..21eb3b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ linux-2.6-openmoko (20081103.git7172ec57-1) UNRELEASED; urgency=low
 
   * New Git Checkout:
     + milestone4.
+  * debian/patches/series: update.
+  * debian/patches/01_fix-timespec_add_ns-in-time.h.patch:
+    - remove, applied uptream.
 
  --
 
diff --git a/debian/patches/01_fix-timespec_add_ns-in-time.h.patch b/debian/patches/01_fix-timespec_add_ns-in-time.h.patch
deleted file mode 100644
index 67af1f1..0000000
--- a/debian/patches/01_fix-timespec_add_ns-in-time.h.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Segher Boessenkool <segher at kernel.crashing.org>
-Date: Tue, 4 Mar 2008 22:59:54 +0000 (-0800)
-Subject: time: prevent the loop in timespec_add_ns() from being optimised away
-X-Git-Url: http://git.openmoko.org/?p=kernel.git;a=commitdiff_plain;h=38332cb98772f5ea757e6486bed7ed0381cb5f98
-
-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 at kernel.crashing.org>
-Cc: john stultz <johnstul at us.ibm.com>
-Cc: Ingo Molnar <mingo at elte.hu>
-Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
-Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
----
-
---- linux-2.6-openmoko.orig/include/linux/time.h
-+++ linux-2.6-openmoko/include/linux/time.h
-@@ -173,6 +173,10 @@
- {
- 	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++;
- 	}
diff --git a/debian/patches/series b/debian/patches/series
index 7bbf28d..0da4852 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-01_fix-timespec_add_ns-in-time.h.patch
+#01_fix-timespec_add_ns-in-time.h.patch

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko