Project "Tuxbox-GIT: cdk":
The branch, master has been updated
via 6e6bca4ab60d4e6650b79694b5c3cbfe510d31f2 (commit)
from df5e3029a8364dba9ef42a2cceeea4df65ffda38 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6e6bca4ab60d4e6650b79694b5c3cbfe510d31f2
Author: GetAway <get-a...@t-online.de>
Date: Sun Nov 10 15:29:46 2013 +0100
fixed the not applying kernel-patch
Signed-off-by: Thilo Graf <d...@novatux.de>
diff --git a/Patches/linux-2.4-dbox2.diff b/Patches/linux-2.4-dbox2.diff
index 4f9549c..9f8d35f 100644
--- a/Patches/linux-2.4-dbox2.diff
+++ b/Patches/linux-2.4-dbox2.diff
@@ -6072,8 +6072,8 @@ diff -Naur linux-2.4.36.2/include/asm-ppc/commproc.h
linux-2.4.36.2_new/include/
#define PC_ENET_TENA ((ushort)0x0002)
Index: b/kernel/timer.c
===================================================================
---- a/kernel/timer.c
-+++ b/kernel/timer.c
+--- timer.c.orig 2010-12-18 16:29:59.000000000 +0100
++++ timer.c 2013-11-10 15:07:38.000000000 +0100
@@ -35,7 +35,12 @@ long tick = (1000000 + HZ/2) / HZ; /* ti
struct timeval xtime __attribute__ ((aligned (16)));
@@ -6089,14 +6089,14 @@ Index: b/kernel/timer.c
DECLARE_TASK_QUEUE(tq_timer);
DECLARE_TASK_QUEUE(tq_immediate);
@@ -487,11 +492,19 @@ static void update_wall_time_one_tick(vo
- * Limit the amount of the step to be in the range
- * -tickadj .. +tickadj
- */
+ * Limit the amount of the step to be in the range
+ * -tickadj .. +tickadj
+ */
- if (time_adjust > tickadj)
- time_adjust_step = tickadj;
- else if (time_adjust < -tickadj)
- time_adjust_step = -tickadj;
--
+-
+ if (time_adjust > tickadj) {
+ if (time_adjust > bigadj)
+ time_adjust_step = 5 * tickadj / 2;
@@ -6110,9 +6110,9 @@ Index: b/kernel/timer.c
+ time_adjust_step = -tickadj;
+ }
+
- /* Reduce by this step the amount of time left */
- time_adjust -= time_adjust_step;
- }
+ /* Reduce by this step the amount of time left */
+ time_adjust -= time_adjust_step;
+ }
diff -uNr linux-2.4.37.11.org//arch/ppc/8xx_io/uart.c
linux-2.4.37.11/arch/ppc/8xx_io/uart.c
--- linux-2.4.37.11.org//arch/ppc/8xx_io/uart.c 2010-12-18
16:29:59.000000000 +0100
+++ linux-2.4.37.11/arch/ppc/8xx_io/uart.c 2011-04-27 12:47:55.000000000
+0200
-----------------------------------------------------------------------
Summary of changes:
Patches/linux-2.4-dbox2.diff | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
--
Tuxbox-GIT: cdk
------------------------------------------------------------------------------
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk
_______________________________________________
Tuxbox-cvs-commits mailing list
Tuxbox-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tuxbox-cvs-commits
