diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-05 08:43:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-05 08:43:50 +0200 |
| commit | 422d2245136a2c49550dc83ca9735dd4d8ea71f7 (patch) | |
| tree | 8dc42f707efcce275baba950be2076ec830f52f4 /include/linux/thread_info.h | |
| parent | b0077b4b085f636e5f8a1fd9cd6e568907471b24 (diff) | |
| parent | e49d033bddf5b565044e2abe4241353959bc9120 (diff) | |
| download | cachepc-linux-422d2245136a2c49550dc83ca9735dd4d8ea71f7.tar.gz cachepc-linux-422d2245136a2c49550dc83ca9735dd4d8ea71f7.zip | |
Merge 5.12-rc6 into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/thread_info.h')
| -rw-r--r-- | include/linux/thread_info.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h index 9b2158c69275..157762db9d4b 100644 --- a/include/linux/thread_info.h +++ b/include/linux/thread_info.h @@ -11,6 +11,7 @@ #include <linux/types.h> #include <linux/bug.h> #include <linux/restart_block.h> +#include <linux/errno.h> #ifdef CONFIG_THREAD_INFO_IN_TASK /* @@ -59,6 +60,18 @@ enum syscall_work_bit { #ifdef __KERNEL__ +#ifndef arch_set_restart_data +#define arch_set_restart_data(restart) do { } while (0) +#endif + +static inline long set_restart_fn(struct restart_block *restart, + long (*fn)(struct restart_block *)) +{ + restart->fn = fn; + arch_set_restart_data(restart); + return -ERESTART_RESTARTBLOCK; +} + #ifndef THREAD_ALIGN #define THREAD_ALIGN THREAD_SIZE #endif |