diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-15 07:13:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-15 07:13:39 -0400 |
| commit | 8bf5e36d0429e9b8fc2c84966577f10386bd7195 (patch) | |
| tree | d060b4ddc3cbc8bddd35a2aa182ed9bed9efb0de /include/uapi | |
| parent | 05a8252bdefe9f2a8931c720afe6200671d631a6 (diff) | |
| parent | c7dc65737c9a607d3e6f8478659876074ad129b8 (diff) | |
| download | op-kernel-dev-8bf5e36d0429e9b8fc2c84966577f10386bd7195.zip op-kernel-dev-8bf5e36d0429e9b8fc2c84966577f10386bd7195.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input update from Dmitry Torokhov:
"The only change is David Hermann's new EVIOCREVOKE evdev ioctl that
allows safely passing file descriptors to input devices to session
processes and later being able to stop delivery of events through
these fds so that inactive sessions will no longer receive user input
that does not belong to them"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: evdev - add EVIOCREVOKE ioctl
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/input.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index d08abf9..a372627 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -152,6 +152,7 @@ struct input_keymap_entry { #define EVIOCGEFFECTS _IOR('E', 0x84, int) /* Report number of effects playable at the same time */ #define EVIOCGRAB _IOW('E', 0x90, int) /* Grab/Release device */ +#define EVIOCREVOKE _IOW('E', 0x91, int) /* Revoke device access */ #define EVIOCSCLOCKID _IOW('E', 0xa0, int) /* Set clockid to be used for timestamps */ |
