Skip to content

Commit

Permalink
Input: input_event - fix the CONFIG_SPARC64 mixup
Browse files Browse the repository at this point in the history
commit 141e5dcaa7356077028b4cd48ec351a38c70e5e5 upstream.

Arnd Bergmann pointed out that CONFIG_* cannot be used in a uapi header.
Override with an equivalent conditional.

Fixes: 2e746942ebac ("Input: input_event - provide override for sparc64")
Fixes: 152194f ("Input: extend usable life of event timestamps to 2106 on 32 bit systems")
Signed-off-by: Deepa Dinamani <[email protected]>
Signed-off-by: Dmitry Torokhov <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
deepa-hub authored and gregkh committed Jan 31, 2019
1 parent d4a6ac2 commit 3a3b6a6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion include/uapi/linux/input.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ struct input_event {
#define input_event_usec time.tv_usec
#else
__kernel_ulong_t __sec;
#ifdef CONFIG_SPARC64
#if defined(__sparc__) && defined(__arch64__)
unsigned int __usec;
#else
__kernel_ulong_t __usec;
Expand Down

0 comments on commit 3a3b6a6

Please sign in to comment.