summaryrefslogtreecommitdiff
path: root/kernel/compat.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-03-27 09:27:01 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-03-27 09:27:01 +0200
commit97318d6427f62b723c89f4150f8f48126ef74961 (patch)
tree771550fabd4b7d67dd4827550bac458036185cb9 /kernel/compat.c
parent2b947f8769be8b8181dc795fd292d3e7120f5204 (diff)
parent197b6b60ae7bc51dd0814953c562833143b292aa (diff)
Merge 6.3-rc4 into usb-next
We need the USB fixes here, and the USB gadget update for future development patches to be based on. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/compat.c')
-rw-r--r--kernel/compat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/compat.c b/kernel/compat.c
index 55551989d9da..fb50f29d9b36 100644
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -152,7 +152,7 @@ COMPAT_SYSCALL_DEFINE3(sched_getaffinity, compat_pid_t, pid, unsigned int, len,
if (len & (sizeof(compat_ulong_t)-1))
return -EINVAL;
- if (!alloc_cpumask_var(&mask, GFP_KERNEL))
+ if (!zalloc_cpumask_var(&mask, GFP_KERNEL))
return -ENOMEM;
ret = sched_getaffinity(pid, mask);