diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-11 05:29:28 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-11 05:29:28 -0400 |
| commit | 1d8ce7bc4d05b4a5c04dc17f92fef26989fb5935 (patch) | |
| tree | 12df0f2e25e95654156b2900bd6df1abb3c2e87a /include/linux/rcutree.h | |
| parent | 3a450de1365d20afde406f0d9b2931a5e4a4fd6a (diff) | |
| parent | 16b71fdf97599f1b1b7f38418ee9922d9f117396 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/include/asm/fixmap_64.h
Diffstat (limited to 'include/linux/rcutree.h')
| -rw-r--r-- | include/linux/rcutree.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h index d4368b7975c3..a722fb67bb2d 100644 --- a/include/linux/rcutree.h +++ b/include/linux/rcutree.h | |||
| @@ -326,4 +326,10 @@ static inline void rcu_exit_nohz(void) | |||
| 326 | } | 326 | } |
| 327 | #endif /* CONFIG_NO_HZ */ | 327 | #endif /* CONFIG_NO_HZ */ |
| 328 | 328 | ||
| 329 | /* A context switch is a grace period for rcutree. */ | ||
| 330 | static inline int rcu_blocking_is_gp(void) | ||
| 331 | { | ||
| 332 | return num_online_cpus() == 1; | ||
| 333 | } | ||
| 334 | |||
| 329 | #endif /* __LINUX_RCUTREE_H */ | 335 | #endif /* __LINUX_RCUTREE_H */ |