Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f930a7a0 authored by H. J. Lu's avatar H. J. Lu Committed by H. Peter Anvin
Browse files

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: default avatarH. Peter Anvin <hpa@zytor.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
parent 9dd4ccaa

drivers/input/input-compat.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/input/input-compat.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

}