diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-06 23:13:32 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-06 23:13:32 -0500 |
| commit | 21ffbf575d5696a5a54d9e286e88a10a7018b000 (patch) | |
| tree | b506f1beffda0ae9da2dcb4c1022c5f0e8a55b28 | |
| parent | 13143860b051d3894bc3fa6d6b8e23f1644a99d8 (diff) | |
| download | rt-patches-21ffbf575d5696a5a54d9e286e88a10a7018b000.tar.gz | |
refresh xtime_lock-Convert-to-raw_seqlock.patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | xtime_lock-Convert-to-raw_seqlock.patch | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/xtime_lock-Convert-to-raw_seqlock.patch b/xtime_lock-Convert-to-raw_seqlock.patch index 726aa1b..c467fac 100644 --- a/xtime_lock-Convert-to-raw_seqlock.patch +++ b/xtime_lock-Convert-to-raw_seqlock.patch @@ -1,4 +1,4 @@ -From 683272263cbf8fa66d4bd90c1922d40bd4edae14 Mon Sep 17 00:00:00 2001 +From 98f51a32b4bdf8a47f66e050a19cc79bbd8ba5e2 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 @@ -102,28 +102,6 @@ index 13c1ee3..8ded01f 100644 #ifdef CONFIG_IPIPE update_root_process_times(get_irq_regs()); -diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c -index 074fe7d..58d2a1a 100644 ---- a/arch/cris/kernel/time.c -+++ b/arch/cris/kernel/time.c -@@ -87,7 +87,7 @@ int do_settimeofday(struct timespec *tv) - if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC) - return -EINVAL; - -- write_seqlock_irq(&xtime_lock); -+ write_raw_seqlock_irq(&xtime_lock); - /* - * This is revolting. We need to set "xtime" correctly. However, the - * value in this location is the value at the most recent update of -@@ -103,7 +103,7 @@ int do_settimeofday(struct timespec *tv) - set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec); - - ntp_clear(); -- write_sequnlock_irq(&xtime_lock); -+ write_raw_sequnlock_irq(&xtime_lock); - clock_was_set(); - return 0; - } diff --git a/arch/frv/kernel/time.c b/arch/frv/kernel/time.c index fb0ce75..82943ba 100644 --- a/arch/frv/kernel/time.c @@ -329,10 +307,10 @@ index 1b16b9a..63bb409 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 75e88c0..3878d49 100644 +index d36a8d3..b773eec 100644 --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c -@@ -702,10 +702,10 @@ static void pcic_clear_clock_irq(void) +@@ -700,10 +700,10 @@ static void pcic_clear_clock_irq(void) static irqreturn_t pcic_timer_handler (int irq, void *h) { |