mirror of https://github.com/OpenIPC/firmware.git
61 lines
1.5 KiB
Diff
61 lines
1.5 KiB
Diff
diff -drupN a/include/linux/thread_info.h b/include/linux/thread_info.h
|
|
--- a/include/linux/thread_info.h 2018-08-06 17:23:04.000000000 +0300
|
|
+++ b/include/linux/thread_info.h 2022-06-12 05:28:14.000000000 +0300
|
|
@@ -9,50 +9,17 @@
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/bug.h>
|
|
-
|
|
-struct timespec;
|
|
-struct compat_timespec;
|
|
+#include <linux/restart_block.h>
|
|
|
|
#ifdef CONFIG_THREAD_INFO_IN_TASK
|
|
-#define current_thread_info() ((struct thread_info *)current)
|
|
-#endif
|
|
-
|
|
/*
|
|
- * System call restart block.
|
|
+ * For CONFIG_THREAD_INFO_IN_TASK kernels we need <asm/current.h> for the
|
|
+ * definition of current, but for !CONFIG_THREAD_INFO_IN_TASK kernels,
|
|
+ * including <asm/current.h> can cause a circular dependency on some platforms.
|
|
*/
|
|
-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;
|
|
+#include <asm/current.h>
|
|
+#define current_thread_info() ((struct thread_info *)current)
|
|
#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>
|