diff options
author | David S. Miller <davem@davemloft.net> | 2017-11-11 18:24:55 +0900 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-11-11 18:24:55 +0900 |
commit | f3edacbd697f94a743fff1a3d26910ab99948ba7 (patch) | |
tree | c185057f2e3ae783ad3ccd5b5b96af200d2eb618 /tools/include | |
parent | bee955cd3ab4f1a1eb8fc16e7ed69364143df8d7 (diff) | |
download | linux-stable-f3edacbd697f94a743fff1a3d26910ab99948ba7.tar.gz linux-stable-f3edacbd697f94a743fff1a3d26910ab99948ba7.tar.bz2 linux-stable-f3edacbd697f94a743fff1a3d26910ab99948ba7.zip |
bpf: Revert bpf_overrid_function() helper changes.
NACK'd by x86 maintainer.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/include')
-rw-r--r-- | tools/include/uapi/linux/bpf.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index adb66f78b674..e880ae6434ee 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -677,10 +677,6 @@ union bpf_attr { * @buf: buf to fill * @buf_size: size of the buf * Return : 0 on success or negative error code - * - * int bpf_override_return(pt_regs, rc) - * @pt_regs: pointer to struct pt_regs - * @rc: the return value to set */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -740,8 +736,7 @@ union bpf_attr { FN(xdp_adjust_meta), \ FN(perf_event_read_value), \ FN(perf_prog_read_value), \ - FN(getsockopt), \ - FN(override_return), + FN(getsockopt), /* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call |