diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2025-12-16 21:29:38 -0800 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2025-12-16 21:29:38 -0800 |
| commit | ec439c38013550420aecc15988ae6acb670838c1 (patch) | |
| tree | acbc097463cf0ca151d1197c0d1eec72dafef54d /kernel/bpf/syscall.c | |
| parent | e7a0adb03dfe1877a11e45a8707e69ba8f4cf94c (diff) | |
| parent | ea1013c1539270e372fc99854bc6e4d94eaeff66 (diff) | |
| download | linux-ec439c38013550420aecc15988ae6acb670838c1.tar.gz linux-ec439c38013550420aecc15988ae6acb670838c1.tar.bz2 linux-ec439c38013550420aecc15988ae6acb670838c1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.19-rc1
Cross-merge BPF and other fixes after downstream PR.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'kernel/bpf/syscall.c')
| -rw-r--r-- | kernel/bpf/syscall.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 3080cc48bfc3..a4d38272d8bc 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -1162,7 +1162,7 @@ static unsigned long bpf_get_unmapped_area(struct file *filp, unsigned long addr if (map->ops->map_get_unmapped_area) return map->ops->map_get_unmapped_area(filp, addr, len, pgoff, flags); #ifdef CONFIG_MMU - return mm_get_unmapped_area(current->mm, filp, addr, len, pgoff, flags); + return mm_get_unmapped_area(filp, addr, len, pgoff, flags); #else return addr; #endif |