提交 3a3b6a6b 编写于 作者: D Deepa Dinamani 提交者: Greg Kroah-Hartman

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: 152194fe ("Input: extend usable life of event timestamps to 2106 on 32 bit systems")
Signed-off-by: NDeepa Dinamani <deepa.kernel@gmail.com>
Signed-off-by: NDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 d4a6ac28
...@@ -32,7 +32,7 @@ struct input_event { ...@@ -32,7 +32,7 @@ struct input_event {
#define input_event_usec time.tv_usec #define input_event_usec time.tv_usec
#else #else
__kernel_ulong_t __sec; __kernel_ulong_t __sec;
#ifdef CONFIG_SPARC64 #if defined(__sparc__) && defined(__arch64__)
unsigned int __usec; unsigned int __usec;
#else #else
__kernel_ulong_t __usec; __kernel_ulong_t __usec;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册