diff options
| author | Deepa Dinamani <deepa.kernel@gmail.com> | 2019-01-24 11:29:20 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-31 10:14:42 +0300 |
| commit | 3a3b6a6b15dbd99d83052070fda2ae2bfdd66dc6 (patch) | |
| tree | f0fa31dd8c955dc792f19de6a6c777c43d378cf1 /include | |
| parent | d4a6ac28d44a8ed2fdc80745d01136d81383d7ed (diff) | |
| download | linux-3a3b6a6b15dbd99d83052070fda2ae2bfdd66dc6.tar.xz | |
Input: input_event - fix the CONFIG_SPARC64 mixup
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: 152194fe9c3f ("Input: extend usable life of event timestamps to 2106 on 32 bit systems")
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/input.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index ffab958bc512..f056b2a00d5c 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -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; |