[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-157-g31ff120

[Nicolas <th...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  31ff120f1c0d39e3e8b8860b1569de283f11b4c5 (commit)
      from  745321073e4a650d23720349367cd58321ea5e95 (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 31ff120f1c0d39e3e8b8860b1569de283f11b4c5
Author: nicolas colombain <nic...@ar...>
Date:   Wed Feb 3 14:25:20 2010 +0100

    [LINUX] fix suspend/resume of hrtimer. Must be corrected in 2.6.32

-----------------------------------------------------------------------

Summary of changes:
 .../2.6.29/352-armadeus-timekeeping.patch          |   30 ++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)
 create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/352-armadeus-timekeeping.patch

diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/352-armadeus-timekeeping.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/352-armadeus-timekeeping.patch
new file mode 100644
index 0000000..351c045
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/352-armadeus-timekeeping.patch
@@ -0,0 +1,30 @@
+--- a/kernel/time/timekeeping.c	2009-03-24 00:12:14.000000000 +0100
++++ b/kernel/time/timekeeping.c	2010-02-03 13:25:00.000000000 +0100
+@@ -322,7 +322,8 @@ static int timekeeping_resume(struct sys
+ 
+ 	clocksource_resume();
+ 
+-	write_seqlock_irqsave(&xtime_lock, flags);
++	local_irq_save(flags);
++	write_seqlock(&xtime_lock);
+ 
+ 	if (now && (now > timekeeping_suspend_time)) {
+ 		unsigned long sleep_length = now - timekeeping_suspend_time;
+@@ -337,7 +338,8 @@ static int timekeeping_resume(struct sys
+ 	clock->cycle_last = clocksource_read(clock);
+ 	clock->error = 0;
+ 	timekeeping_suspended = 0;
+-	write_sequnlock_irqrestore(&xtime_lock, flags);
++	write_sequnlock(&xtime_lock);
++
+ 
+ 	touch_softlockup_watchdog();
+ 
+@@ -345,6 +347,7 @@ static int timekeeping_resume(struct sys
+ 
+ 	/* Resume hrtimers */
+ 	hres_timers_resume();
++	local_irq_restore(flags);
+ 
+ 	return 0;
+ }


hooks/post-receive
-- 
armadeus