summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-10-12 16:37:13 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-10-12 16:37:13 -0700
commite18afa5bfa4a2f0e07b0864370485df701dacbc1 (patch)
treeba2ad24758dccd2d34b7f5df4326c175c7beb7b0 /kernel
parent85ed13e78dbedf9433115a62c85429922bc5035c (diff)
parent80bdad3d7e3ec03f812471d9309f5f682e10f52b (diff)
Merge branch 'work.quota-compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull compat quotactl cleanups from Al Viro: "More Christoph's compat cleanups: quotactl(2)" * 'work.quota-compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: quota: simplify the quotactl compat handling compat: add a compat_need_64bit_alignment_fixup() helper compat: lift compat_s64 and compat_u64 to <asm-generic/compat.h>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sys_ni.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c
index 4d59775ea79c..c925d1e1777e 100644
--- a/kernel/sys_ni.c
+++ b/kernel/sys_ni.c
@@ -369,7 +369,6 @@ COND_SYSCALL_COMPAT(fanotify_mark);
/* x86 */
COND_SYSCALL(vm86old);
COND_SYSCALL(modify_ldt);
-COND_SYSCALL_COMPAT(quotactl32);
COND_SYSCALL(vm86);
COND_SYSCALL(kexec_file_load);