iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compat: Use COMPAT_USE_64BIT_TIME in the input subsystem

Browse Source 
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>
This commit is contained in:
H. J. Lu 2012-02-10 14:10:52 -08:00 committed by H. Peter Anvin
parent 9dd4ccaaf8
commit f930a7a0f4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/input/input-compat.c
View File

@ -17,7 +17,7 @@
int input_event_from_user(const char __user *buffer, int input_event_from_user(const char __user *buffer,
struct input_event *event) struct input_event *event)
{ {
if (INPUT_COMPAT_TEST) { if (INPUT_COMPAT_TEST && !COMPAT_USE_64BIT_TIME) {
struct input_event_compat compat_event; struct input_event_compat compat_event;
if (copy_from_user(&compat_event, buffer, 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, int input_event_to_user(char __user *buffer,
const struct input_event *event) const struct input_event *event)
{ {
if (INPUT_COMPAT_TEST) { if (INPUT_COMPAT_TEST && !COMPAT_USE_64BIT_TIME) {
struct input_event_compat compat_event; struct input_event_compat compat_event;
compat_event.time.tv_sec = event->time.tv_sec; compat_event.time.tv_sec = event->time.tv_sec;

2
drivers/input/input-compat.h
View File

@ -67,7 +67,7 @@ struct ff_effect_compat {
static inline size_t input_event_size(void) 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); sizeof(struct input_event_compat) : sizeof(struct input_event);
} }