diff options
| author | H. J. Lu <hjl.tools@gmail.com> | 2012-02-10 14:10:52 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-02-20 12:48:47 -0800 |
| commit | f930a7a0f4c87bf3ee731383421ebf3164009ee7 (patch) | |
| tree | 9f7702464501cf71c2759036f60ca76c6e98f4c2 /drivers | |
| parent | 9dd4ccaaf8cde924b78ba5f5b1a8ce3e7ead687f (diff) | |
| download | linux-f930a7a0f4c87bf3ee731383421ebf3164009ee7.tar.gz linux-f930a7a0f4c87bf3ee731383421ebf3164009ee7.tar.bz2 linux-f930a7a0f4c87bf3ee731383421ebf3164009ee7.zip | |
compat: Use COMPAT_USE_64BIT_TIME in the input subsystem
Enable the input system to be used with a compat ABI with 64-bit time.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/input-compat.c | 4 | ||||
| -rw-r--r-- | drivers/input/input-compat.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/input-compat.c b/drivers/input/input-compat.c index e46a86776a6b..64ca7113ff28 100644 --- a/drivers/input/input-compat.c +++ b/drivers/input/input-compat.c @@ -17,7 +17,7 @@ int input_event_from_user(const char __user *buffer, struct input_event *event) { - if (INPUT_COMPAT_TEST) { + if (INPUT_COMPAT_TEST && !COMPAT_USE_64BIT_TIME) { struct input_event_compat compat_event; if (copy_from_user(&compat_event, buffer, @@ -41,7 +41,7 @@ int input_event_from_user(const char __user *buffer, int input_event_to_user(char __user *buffer, const struct input_event *event) { - if (INPUT_COMPAT_TEST) { + if (INPUT_COMPAT_TEST && !COMPAT_USE_64BIT_TIME) { struct input_event_compat compat_event; compat_event.time.tv_sec = event->time.tv_sec; diff --git a/drivers/input/input-compat.h b/drivers/input/input-compat.h index 22be27b424de..148f66fe3205 100644 --- a/drivers/input/input-compat.h +++ b/drivers/input/input-compat.h @@ -67,7 +67,7 @@ struct ff_effect_compat { static inline size_t input_event_size(void) { - return INPUT_COMPAT_TEST ? + return (INPUT_COMPAT_TEST && !COMPAT_USE_64BIT_TIME) ? sizeof(struct input_event_compat) : sizeof(struct input_event); } |