diff options
| author | Linus Walleij | 2018-03-18 17:48:59 +0100 |
|---|---|---|
| committer | Linus Walleij | 2018-03-18 17:48:59 +0100 |
| commit | 95260c17b27e4bdacf85022e629fb701b42cc190 (patch) | |
| tree | cfc6963180d99e5f36752ca028821aaa109e860d /include/linux/sched/user.h | |
| parent | gpio: mockup: Update Bamvors mail address (diff) | |
| parent | Linux 4.16-rc5 (diff) | |
| download | kernel-qcow2-linux-95260c17b27e4bdacf85022e629fb701b42cc190.tar.gz kernel-qcow2-linux-95260c17b27e4bdacf85022e629fb701b42cc190.tar.xz kernel-qcow2-linux-95260c17b27e4bdacf85022e629fb701b42cc190.zip | |
Merge tag 'v4.16-rc5' into devel
Linux 4.16-rc5 merged into the GPIO devel branch to resolve
a nasty conflict between fixes and devel in the RCAR driver.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include/linux/sched/user.h')
| -rw-r--r-- | include/linux/sched/user.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/sched/user.h b/include/linux/sched/user.h index 0dcf4e480ef7..96fe289c4c6e 100644 --- a/include/linux/sched/user.h +++ b/include/linux/sched/user.h @@ -4,6 +4,7 @@ #include <linux/uidgid.h> #include <linux/atomic.h> +#include <linux/ratelimit.h> struct key; @@ -41,6 +42,9 @@ struct user_struct { defined(CONFIG_NET) atomic_long_t locked_vm; #endif + + /* Miscellaneous per-user rate limit */ + struct ratelimit_state ratelimit; }; extern int uids_sysfs_init(void); |