diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-08-23 11:32:34 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-08-23 11:32:34 +0200 |
commit | a6b9b4d50f492630443b38404d1f436b3b748c14 (patch) | |
tree | f3512389c42cecfae50b6a315ec6ab1fa470e30d /include/linux/input.h | |
parent | e36c886a0f9d624377977fa6cae309cfd7f362fa (diff) | |
parent | 28457ee69c473a903e51e26c7bcd6f1e9eceb93e (diff) |
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/rcu
Diffstat (limited to 'include/linux/input.h')
-rw-r--r-- | include/linux/input.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/input.h b/include/linux/input.h index 896a92227bc4..d6ae1761be97 100644 --- a/include/linux/input.h +++ b/include/linux/input.h @@ -1196,7 +1196,7 @@ struct input_dev { int (*flush)(struct input_dev *dev, struct file *file); int (*event)(struct input_dev *dev, unsigned int type, unsigned int code, int value); - struct input_handle *grab; + struct input_handle __rcu *grab; spinlock_t event_lock; struct mutex mutex; |