diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2017-08-14 23:07:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-14 23:07:27 +0000 |
| commit | 5788d6584454fecdbf97f7892ec6da114d9922f4 (patch) | |
| tree | 8825052b1b8b72b4a701cdfe720f84a2ac74f47f | |
| parent | 21c588892cd0bcdcaf4ba8eadf389438fb8d6f2e (diff) | |
| parent | fde899dd6e6d30195b602b9985492a896cda6cb1 (diff) | |
| download | v4.4-5788d6584454fecdbf97f7892ec6da114d9922f4.tar.gz | |
UPSTREAM: thread_info: factor out restart_block am: 264c551c4c
am: fde899dd6e
Change-Id: Id60265eeb6aacd1f110ee9057d68b1b3f1a9e37f
| -rw-r--r-- | include/linux/restart_block.h | 51 | ||||
| -rw-r--r-- | include/linux/thread_info.h | 41 |
2 files changed, 52 insertions, 40 deletions
diff --git a/include/linux/restart_block.h b/include/linux/restart_block.h new file mode 100644 index 000000000000..0d905d8ec553 --- /dev/null +++ b/include/linux/restart_block.h @@ -0,0 +1,51 @@ +/* + * Common syscall restarting data + */ +#ifndef __LINUX_RESTART_BLOCK_H +#define __LINUX_RESTART_BLOCK_H + +#include <linux/compiler.h> +#include <linux/types.h> + +struct timespec; +struct compat_timespec; +struct pollfd; + +/* + * System call restart block. + */ +struct restart_block { + long (*fn)(struct restart_block *); + union { + /* For futex_wait and futex_wait_requeue_pi */ + struct { + u32 __user *uaddr; + u32 val; + u32 flags; + u32 bitset; + u64 time; + u32 __user *uaddr2; + } futex; + /* For nanosleep */ + struct { + clockid_t clockid; + struct timespec __user *rmtp; +#ifdef CONFIG_COMPAT + struct compat_timespec __user *compat_rmtp; +#endif + u64 expires; + } nanosleep; + /* For poll */ + struct { + struct pollfd __user *ufds; + int nfds; + int has_timeout; + unsigned long tv_sec; + unsigned long tv_nsec; + } poll; + }; +}; + +extern long do_no_restart_syscall(struct restart_block *parm); + +#endif /* __LINUX_RESTART_BLOCK_H */ diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h index 8784cebd0f51..e8369b0d71e1 100644 --- a/include/linux/thread_info.h +++ b/include/linux/thread_info.h @@ -9,9 +9,7 @@ #include <linux/types.h> #include <linux/bug.h> - -struct timespec; -struct compat_timespec; +#include <linux/restart_block.h> #ifdef CONFIG_THREAD_INFO_IN_TASK struct thread_info { @@ -28,43 +26,6 @@ struct thread_info { #define current_thread_info() ((struct thread_info *)current) #endif -/* - * System call restart block. - */ -struct restart_block { - long (*fn)(struct restart_block *); - union { - /* For futex_wait and futex_wait_requeue_pi */ - struct { - u32 __user *uaddr; - u32 val; - u32 flags; - u32 bitset; - u64 time; - u32 __user *uaddr2; - } futex; - /* For nanosleep */ - struct { - clockid_t clockid; - struct timespec __user *rmtp; -#ifdef CONFIG_COMPAT - struct compat_timespec __user *compat_rmtp; -#endif - u64 expires; - } nanosleep; - /* For poll */ - struct { - struct pollfd __user *ufds; - int nfds; - int has_timeout; - unsigned long tv_sec; - unsigned long tv_nsec; - } poll; - }; -}; - -extern long do_no_restart_syscall(struct restart_block *parm); - #include <linux/bitops.h> #include <asm/thread_info.h> |