summaryrefslogtreecommitdiff
path: root/include/linux/restart_block.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/restart_block.h')
-rw-r--r--include/linux/restart_block.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/include/linux/restart_block.h b/include/linux/restart_block.h
index 19df8422606c..36ddfa1ec301 100644
--- a/include/linux/restart_block.h
+++ b/include/linux/restart_block.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
/*
* Common syscall restarting data
*/
@@ -7,25 +8,25 @@
#include <linux/compiler.h>
#include <linux/types.h>
+struct __kernel_timespec;
struct timespec;
-struct compat_timespec;
+struct old_timespec32;
struct pollfd;
enum timespec_type {
TT_NONE = 0,
TT_NATIVE = 1,
-#ifdef CONFIG_COMPAT
TT_COMPAT = 2,
-#endif
};
/*
* System call restart block.
*/
struct restart_block {
+ unsigned long arch_data;
long (*fn)(struct restart_block *);
union {
- /* For futex_wait and futex_wait_requeue_pi */
+ /* For futex_wait() */
struct {
u32 __user *uaddr;
u32 val;
@@ -39,12 +40,10 @@ struct restart_block {
clockid_t clockid;
enum timespec_type type;
union {
- struct timespec __user *rmtp;
-#ifdef CONFIG_COMPAT
- struct compat_timespec __user *compat_rmtp;
-#endif
+ struct __kernel_timespec __user *rmtp;
+ struct old_timespec32 __user *compat_rmtp;
};
- u64 expires;
+ ktime_t expires;
} nanosleep;
/* For poll */
struct {