diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 08:58:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 08:58:50 -0700 |
| commit | 19426a8f810752b4218e59b1e2187f33e255f7bc (patch) | |
| tree | dd88adc38ef98a10b1eea952f16d7480411e2409 /include/linux | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6 (diff) | |
| parent | posix-timers: RCU conversion (diff) | |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
posix-timers: RCU conversion
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/posix-timers.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h index 808227d40a64..959c14132f46 100644 --- a/include/linux/posix-timers.h +++ b/include/linux/posix-timers.h @@ -82,6 +82,7 @@ struct k_itimer { unsigned long expires; } mmtimer; struct alarm alarmtimer; + struct rcu_head rcu; } it; }; |