summaryrefslogtreecommitdiffstats
path: root/kernel/user.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2018-03-14 20:37:31 +0100
committerThomas Gleixner <tglx@linutronix.de>2018-03-14 20:37:31 +0100
commitb0d8bef8ed805ca92eb91e86acf3ce89cbebc8ce (patch)
tree8838391a76f0cf75ffcd31166996d03d19c580a6 /kernel/user.c
parent82b691bedf05f258f1c86c96ee574b0d7795c0a1 (diff)
parentfc6eabbbf8ef99efed778dd5afabc83c21dba585 (diff)
downloadlinux-b0d8bef8ed805ca92eb91e86acf3ce89cbebc8ce.tar.gz
linux-b0d8bef8ed805ca92eb91e86acf3ce89cbebc8ce.zip
Merge branch 'linus' into irq/core to pick up dependencies.
Diffstat (limited to 'kernel/user.c')
-rw-r--r--kernel/user.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/user.c b/kernel/user.c
index 9a20acce460d..36288d840675 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -101,6 +101,7 @@ struct user_struct root_user = {
.sigpending = ATOMIC_INIT(0),
.locked_shm = 0,
.uid = GLOBAL_ROOT_UID,
+ .ratelimit = RATELIMIT_STATE_INIT(root_user.ratelimit, 0, 0),
};
/*
@@ -191,6 +192,8 @@ struct user_struct *alloc_uid(kuid_t uid)
new->uid = uid;
atomic_set(&new->__count, 1);
+ ratelimit_state_init(&new->ratelimit, HZ, 100);
+ ratelimit_set_flags(&new->ratelimit, RATELIMIT_MSG_ON_RELEASE);
/*
* Before adding this, check whether we raced