diff options
| author | Linus Walleij <[email protected]> | 2021-11-27 00:54:16 +0100 |
|---|---|---|
| committer | Linus Walleij <[email protected]> | 2021-11-27 00:54:16 +0100 |
| commit | 2448eab44034d9603c97ca17760a53d4d6e4b60c (patch) | |
| tree | 7f323cea55258e94e0c7c70b63d02c9effb00c1f /kernel/bpf/cgroup.c | |
| parent | deee705a1c9cce9c7eb699d529f1c0b3c80d339d (diff) | |
| parent | 136057256686de39cc3a07c2e39ef6bc43003ff6 (diff) | |
Merge tag 'v5.16-rc2' into devel
Linux 5.16-rc2 is needed because nonurgent fixes headed
for next are strongly textually dependent on a fix that
was applied for rc2.
Signed-off-by: Linus Walleij <[email protected]>
Diffstat (limited to 'kernel/bpf/cgroup.c')
| -rw-r--r-- | kernel/bpf/cgroup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c index 2ca643af9a54..43eb3501721b 100644 --- a/kernel/bpf/cgroup.c +++ b/kernel/bpf/cgroup.c @@ -1809,6 +1809,8 @@ sysctl_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) return &bpf_sysctl_get_new_value_proto; case BPF_FUNC_sysctl_set_new_value: return &bpf_sysctl_set_new_value_proto; + case BPF_FUNC_ktime_get_coarse_ns: + return &bpf_ktime_get_coarse_ns_proto; default: return cgroup_base_func_proto(func_id, prog); } |