diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 17:56:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-16 17:56:39 -0700 |
| commit | 4d831f53ddd5c0117ff40f841cf330c78d242e82 (patch) | |
| tree | 29bca9f045f22af41a7a059afba85f5eb74ab267 /include | |
| parent | Merge branch 'x86/uv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | kernel/softirq.c: fix sparse warning (diff) | |
| download | linux-dev-4d831f53ddd5c0117ff40f841cf330c78d242e82.tar.xz linux-dev-4d831f53ddd5c0117ff40f841cf330c78d242e82.zip | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
kernel/softirq.c: fix sparse warning
rcu: Make hierarchical RCU less IPI-happy
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/rcutree.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h index 0cdda00f2b2a..58b2aa5312b9 100644 --- a/include/linux/rcutree.h +++ b/include/linux/rcutree.h @@ -161,9 +161,8 @@ struct rcu_data { unsigned long offline_fqs; /* Kicked due to being offline. */ unsigned long resched_ipi; /* Sent a resched IPI. */ - /* 5) state to allow this CPU to force_quiescent_state on others */ + /* 5) For future __rcu_pending statistics. */ long n_rcu_pending; /* rcu_pending() calls since boot. */ - long n_rcu_pending_force_qs; /* when to force quiescent states. */ int cpu; }; |