refresh xtime_lock-Convert-to-raw_seqlock.patchv2.6.33-1841-ge56425b

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

1 files changed, 11 insertions, 11 deletions

diff --git a/xtime_lock-Convert-to-raw_seqlock.patch b/xtime_lock-Convert-to-raw_seqlock.patch
index 3fca1aa..350b725 100644
--- a/xtime_lock-Convert-to-raw_seqlock.patch
+++ b/xtime_lock-Convert-to-raw_seqlock.patch
@@ -1,4 +1,4 @@
-From e9737360de94c7d789e1230e69e1ea587a7764ad Mon Sep 17 00:00:00 2001
+From 5ac0b70a9a0b0d9f152cf567c734b2fbe8df9ef3 Mon Sep 17 00:00:00 2001
 From: Thomas Gleixner <tglx@linutronix.de>
 Date: Sat, 25 Jul 2009 19:43:27 +0200
 Subject: [PATCH] xtime_lock: Convert to raw_seqlock
@@ -163,7 +163,7 @@ index 7f2d6cf..d08012c 100644
  }
  
 diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
-index a35c661..3b8e4f1 100644
+index 47a1927..fb3ede3 100644
 --- a/arch/ia64/kernel/time.c
 +++ b/arch/ia64/kernel/time.c
 @@ -197,10 +197,10 @@ timer_interrupt (int irq, void *dev_id)
@@ -307,10 +307,10 @@ index a79c6f9..52c8cf7 100644
  		printk(KERN_ERR "Error reading tod clock\n");
  	        xtime.tv_sec = 0;
 diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
-index 6c6093d..d5f6048 100644
+index 1b16b9a..63bb409 100644
 --- a/arch/powerpc/kernel/time.c
 +++ b/arch/powerpc/kernel/time.c
-@@ -1049,7 +1049,7 @@ void __init time_init(void)
+@@ -1051,7 +1051,7 @@ void __init time_init(void)
  	/* Save the current timebase to pretty up CONFIG_PRINTK_TIME */
  	boot_tb = get_tb_or_rtc();
  
@@ -319,7 +319,7 @@ index 6c6093d..d5f6048 100644
  
  	/* If platform provided a timezone (pmac), we correct the time */
          if (timezone_offset) {
-@@ -1063,7 +1063,7 @@ void __init time_init(void)
+@@ -1065,7 +1065,7 @@ void __init time_init(void)
  	vdso_data->stamp_xsec = (u64) xtime.tv_sec * XSEC_PER_SEC;
  	vdso_data->tb_to_xs = tb_to_xs;
  
@@ -329,7 +329,7 @@ index 6c6093d..d5f6048 100644
  	/* Start the decrementer on CPUs that have manual control
  	 * such as BookE
 diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
-index 4e2724e..2e321d7 100644
+index 75e88c0..3878d49 100644
 --- a/arch/sparc/kernel/pcic.c
 +++ b/arch/sparc/kernel/pcic.c
 @@ -702,10 +702,10 @@ static void pcic_clear_clock_irq(void)
@@ -464,7 +464,7 @@ index 8047980..adbe583 100644
  }
  EXPORT_SYMBOL(get_jiffies_64);
 diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
-index 4800f93..ed2aec1 100644
+index 7c0f180..c1aabf0 100644
 --- a/kernel/time/ntp.c
 +++ b/kernel/time/ntp.c
 @@ -188,7 +188,7 @@ static enum hrtimer_restart ntp_leap_second(struct hrtimer *timer)
@@ -587,7 +587,7 @@ index f992762..bc625d9 100644
  	if (rcu_needs_cpu(cpu) || printk_needs_cpu(cpu) ||
  	    arch_needs_cpu(cpu)) {
 diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
-index e2ab064..ee2b90f 100644
+index 1673637..73373a3 100644
 --- a/kernel/time/timekeeping.c
 +++ b/kernel/time/timekeeping.c
 @@ -135,8 +135,7 @@ static inline s64 timekeeping_get_ns_raw(void)
@@ -756,8 +756,8 @@ index e2ab064..ee2b90f 100644
 +	write_raw_sequnlock_irqrestore(&xtime_lock, flags);
  
  	clockevents_notify(CLOCK_EVT_NOTIFY_SUSPEND, NULL);
- 
-@@ -909,10 +908,10 @@ struct timespec current_kernel_time(void)
+ 	clocksource_suspend();
+@@ -910,10 +909,10 @@ struct timespec current_kernel_time(void)
  	unsigned long seq;
  
  	do {
@@ -770,7 +770,7 @@ index e2ab064..ee2b90f 100644
  
  	return now;
  }
-@@ -924,11 +923,11 @@ struct timespec get_monotonic_coarse(void)
+@@ -925,11 +924,11 @@ struct timespec get_monotonic_coarse(void)
  	unsigned long seq;
  
  	do {