From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org,
linux-rt-users <linux-rt-users@vger.kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Carsten Emde <C.Emde@osadl.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
John Kacur <jkacur@redhat.com>, <stable-rt@vger.kernel.org>,
Zhao Hongjiang <zhaohongjiang@huawei.com>
Subject: [PATCH RT 06/19] timers: prepare for full preemption improve
Date: Sun, 08 Sep 2013 11:14:01 -0400 [thread overview]
Message-ID: <20130908151446.754102670@goodmis.org> (raw)
In-Reply-To: 20130908151355.362583092@goodmis.org
[-- Attachment #1: 0006-timers-prepare-for-full-preemption-improve.patch --]
[-- Type: text/plain, Size: 1747 bytes --]
From: Zhao Hongjiang <zhaohongjiang@huawei.com>
wake_up should do nothing on the nort, so we should use wakeup_timer_waiters,
also fix a spell mistake.
Cc: stable-rt@vger.kernel.org
Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com>
[bigeasy: s/CONFIG_PREEMPT_RT_BASE/CONFIG_PREEMPT_RT_FULL/]
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
kernel/timer.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/kernel/timer.c b/kernel/timer.c
index 027ce4e..61b57c1 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -76,7 +76,9 @@ struct tvec_root {
struct tvec_base {
spinlock_t lock;
struct timer_list *running_timer;
+#ifdef CONFIG_PREEMPT_RT_FULL
wait_queue_head_t wait_for_running_timer;
+#endif
unsigned long timer_jiffies;
unsigned long next_timer;
unsigned long active_timers;
@@ -1006,7 +1008,7 @@ static void wait_for_running_timer(struct timer_list *timer)
base->running_timer != timer);
}
-# define wakeup_timer_waiters(b) wake_up(&(b)->wait_for_tunning_timer)
+# define wakeup_timer_waiters(b) wake_up(&(b)->wait_for_running_timer)
#else
static inline void wait_for_running_timer(struct timer_list *timer)
{
@@ -1251,7 +1253,7 @@ static inline void __run_timers(struct tvec_base *base)
spin_lock_irq(&base->lock);
}
}
- wake_up(&base->wait_for_running_timer);
+ wakeup_timer_waiters(base);
spin_unlock_irq(&base->lock);
}
@@ -1765,7 +1767,9 @@ static int __cpuinit init_timers_cpu(int cpu)
base = &boot_tvec_bases;
}
spin_lock_init(&base->lock);
+#ifdef CONFIG_PREEMPT_RT_FULL
init_waitqueue_head(&base->wait_for_running_timer);
+#endif
tvec_base_done[cpu] = 1;
} else {
base = per_cpu(tvec_bases, cpu);
--
1.7.10.4
next prev parent reply other threads:[~2013-09-08 15:14 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-08 15:13 [PATCH RT 00/19] 3.6.11.8-rt41-rc1 stable review Steven Rostedt
2013-09-08 15:13 ` [PATCH RT 01/19] sched/workqueue: Only wake up idle workers if not blocked on sleeping spin lock Steven Rostedt
2013-09-08 15:13 ` [PATCH RT 02/19] x86/mce: fix mce timer interval Steven Rostedt
2013-09-08 15:13 ` [PATCH RT 03/19] genirq: Set irq thread to RT priority on creation Steven Rostedt
2013-09-08 15:13 ` [PATCH RT 04/19] list_bl.h: make list head locking RT safe Steven Rostedt
2013-09-08 15:14 ` [PATCH RT 05/19] list_bl.h: fix it for for !SMP && !DEBUG_SPINLOCK Steven Rostedt
2013-09-08 15:14 ` Steven Rostedt [this message]
2013-09-08 15:14 ` [PATCH RT 07/19] kernel/cpu: fix cpu down problem if kthreads cpu is going down Steven Rostedt
2013-09-08 15:14 ` [PATCH RT 08/19] kernel/hotplug: restore original cpu mask oncpu/down Steven Rostedt
2013-09-08 15:14 ` [PATCH RT 09/19] gpu: i915: allow the user not to do the wbinvd Steven Rostedt
2013-09-08 15:14 ` [PATCH RT 10/19] drm/i915: drop trace_i915_gem_ring_dispatch on rt Steven Rostedt
2013-09-08 15:14 ` [PATCH RT 11/19] sched: Distangle worker accounting from rqlock Steven Rostedt
2013-09-08 15:14 ` [PATCH RT 12/19] rt,ntp: Move call to schedule_delayed_work() to helper thread Steven Rostedt
2013-09-08 15:14 ` [PATCH RT 13/19] hpsa: fix warning with smp_processor_id() in preemptible section Steven Rostedt
2013-09-08 15:14 ` [PATCH RT 14/19] hwlat-detector: Update hwlat_detector to add outer loop detection Steven Rostedt
2013-09-08 15:14 ` [PATCH RT 15/19] hwlat-detect/trace: Export trace_clock_local for hwlat-detector Steven Rostedt
2013-09-08 15:14 ` [PATCH RT 16/19] hwlat-detector: Use trace_clock_local if available Steven Rostedt
2013-09-08 15:14 ` [PATCH RT 17/19] hwlat-detector: Use thread instead of stop machine Steven Rostedt
2013-09-08 15:14 ` [PATCH RT 18/19] genirq: do not invoke the affinity callback via a workqueue Steven Rostedt
2013-09-08 15:14 ` [PATCH RT 19/19] Linux 3.6.11.8-rt41-rc1 Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130908151446.754102670@goodmis.org \
--to=rostedt@goodmis.org \
--cc=C.Emde@osadl.org \
--cc=bigeasy@linutronix.de \
--cc=jkacur@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=stable-rt@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=zhaohongjiang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).