From f917892d71b066ebc24436ff78c924b5de72f57e Mon Sep 17 00:00:00 2001 From: Lai Jiangshan Date: Thu, 29 Nov 2012 16:46:08 +0800 Subject: [PATCH] --- yaml --- r: 349821 b: refs/heads/master c: 49271ca60645d64197b28c0835fed39f74b1a2d7 h: refs/heads/master i: 349819: c672a07d885073654e99529aed7e51d18794acd7 v: v3 --- [refs] | 2 +- trunk/kernel/srcu.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e652375903f6..f320ba885bbf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34a64b6bb64b5cf193932e2b4394c5284732e008 +refs/heads/master: 49271ca60645d64197b28c0835fed39f74b1a2d7 diff --git a/trunk/kernel/srcu.c b/trunk/kernel/srcu.c index f098f1768215..e34f2991ed41 100644 --- a/trunk/kernel/srcu.c +++ b/trunk/kernel/srcu.c @@ -477,12 +477,11 @@ EXPORT_SYMBOL_GPL(synchronize_srcu); * Wait for an SRCU grace period to elapse, but be more aggressive about * spinning rather than blocking when waiting. * - * Note that it is illegal to call this function while holding any lock - * that is acquired by a CPU-hotplug notifier. It is also illegal to call - * synchronize_srcu_expedited() from the corresponding SRCU read-side - * critical section; doing so will result in deadlock. However, it is - * perfectly legal to call synchronize_srcu_expedited() on one srcu_struct - * from some other srcu_struct's read-side critical section, as long as + * Note that it is also illegal to call synchronize_srcu_expedited() + * from the corresponding SRCU read-side critical section; + * doing so will result in deadlock. However, it is perfectly legal + * to call synchronize_srcu_expedited() on one srcu_struct from some + * other srcu_struct's read-side critical section, as long as * the resulting graph of srcu_structs is acyclic. */ void synchronize_srcu_expedited(struct srcu_struct *sp)