diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-17 00:56:39 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-17 00:56:39 (GMT) |
| commit | 4d831f53ddd5c0117ff40f841cf330c78d242e82 (patch) | |
| tree | 29bca9f045f22af41a7a059afba85f5eb74ab267 /include/linux | |
| parent | 20d9207849d5abe60461841b3c3724f6e7c9d33e (diff) | |
| parent | 79d381c9f2354b594dcab9b04dfcc0debf7294fe (diff) | |
| download | linux-fsl-qoriq-4d831f53ddd5c0117ff40f841cf330c78d242e82.tar.xz | |
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/linux')
| -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 0cdda00..58b2aa5 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; }; |