From db1213de1d9268870c7dece0aaa8f4a603d22f13 Mon Sep 17 00:00:00 2001 From: "H. J. Lu" Date: Fri, 10 Feb 2012 14:10:52 -0800 Subject: [PATCH] --- yaml --- r: 297710 b: refs/heads/master c: f930a7a0f4c87bf3ee731383421ebf3164009ee7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/input-compat.c | 4 ++-- trunk/drivers/input/input-compat.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index db2d5c4d2e53..5b891be8c560 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9dd4ccaaf8cde924b78ba5f5b1a8ce3e7ead687f +refs/heads/master: f930a7a0f4c87bf3ee731383421ebf3164009ee7 diff --git a/trunk/drivers/input/input-compat.c b/trunk/drivers/input/input-compat.c index e46a86776a6b..64ca7113ff28 100644 --- a/trunk/drivers/input/input-compat.c +++ b/trunk/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/trunk/drivers/input/input-compat.h b/trunk/drivers/input/input-compat.h index 22be27b424de..148f66fe3205 100644 --- a/trunk/drivers/input/input-compat.h +++ b/trunk/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); }