From b873785089e284266998cdad244bac5ab8315be7 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Sun, 11 Jan 2015 02:16:39 +0300 Subject: [PATCH] Fix umount and umount2 syscall entries * linux/aarch64/syscallent1.h (umount): Change nargs to 1. * linux/avr32/syscallent.h: Likewise. * linux/xtensa/syscallent.h: Likewise. * linux/ia64/syscallent.h (umount2): Change nargs to 2. * linux/arm/syscallent.h (umount, umount2): Fix sys_name. * linux/bfin/syscallent.h: Likewise. * linux/i386/syscallent.h: Likewise. * linux/m68k/syscallent.h: Likewise. * linux/microblaze/syscallent.h: Likewise. * linux/powerpc/syscallent.h: Likewise. * linux/s390/syscallent.h: Likewise. * linux/s390x/syscallent.h: Likewise. * linux/sh/syscallent.h: Likewise. * linux/sh64/syscallent.h: Likewise. * linux/sparc/syscallent.h: Likewise. * linux/metag/syscallent.h: (umount2): Fix sys_name. * linux/or1k/syscallent.h: Likewise. * linux/x32/syscallent.h: Likewise. * linux/x86_64/syscallent.h: Likewise. --- linux/aarch64/syscallent1.h | 2 +- linux/arm/syscallent.h | 4 ++-- linux/avr32/syscallent.h | 2 +- linux/bfin/syscallent.h | 4 ++-- linux/i386/syscallent.h | 4 ++-- linux/ia64/syscallent.h | 2 +- linux/m68k/syscallent.h | 4 ++-- linux/metag/syscallent.h | 2 +- linux/microblaze/syscallent.h | 4 ++-- linux/or1k/syscallent.h | 2 +- linux/powerpc/syscallent.h | 4 ++-- linux/s390/syscallent.h | 4 ++-- linux/s390x/syscallent.h | 4 ++-- linux/sh/syscallent.h | 4 ++-- linux/sh64/syscallent.h | 4 ++-- linux/sparc/syscallent.h | 4 ++-- linux/x32/syscallent.h | 2 +- linux/x86_64/syscallent.h | 2 +- linux/xtensa/syscallent.h | 2 +- 19 files changed, 30 insertions(+), 30 deletions(-) diff --git a/linux/aarch64/syscallent1.h b/linux/aarch64/syscallent1.h index de77bc5e..4ec9665f 100644 --- a/linux/aarch64/syscallent1.h +++ b/linux/aarch64/syscallent1.h @@ -68,7 +68,7 @@ [1073] = { 6, TN, sys_recv, "recv" }, [1074] = { 4, TN, sys_send, "send" }, [1075] = { 2, 0, sys_bdflush, "bdflush" }, -[1076] = { 2, TF, sys_umount, "umount" }, +[1076] = { 1, TF, sys_umount, "umount" }, [1077] = { 1, TF, sys_uselib, "uselib" }, [1078] = { 1, 0, sys_sysctl, "sysctl" }, [1079] = { 0, TP, sys_fork, "fork" }, diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h index edf98b3a..0f640b34 100644 --- a/linux/arm/syscallent.h +++ b/linux/arm/syscallent.h @@ -48,7 +48,7 @@ { 3, TD, sys_lseek, "lseek" }, /* 19 */ { 0, 0, sys_getpid, "getpid" }, /* 20 */ { 5, TF, sys_mount, "mount" }, /* 21 */ - { 1, TF, sys_umount, "oldumount" }, /* 22 */ + { 1, TF, sys_umount, "umount" }, /* 22 */ { 1, 0, sys_setuid16, "setuid" }, /* 23 */ { 0, NF, sys_getuid16, "getuid" }, /* 24 */ { 1, 0, sys_stime, "stime" }, /* 25 */ @@ -78,7 +78,7 @@ { 0, NF, sys_geteuid16, "geteuid" }, /* 49 */ { 0, NF, sys_getegid16, "getegid" }, /* 50 */ { 1, TF, sys_acct, "acct" }, /* 51 */ - { 2, TF, sys_umount2, "umount" }, /* 52 */ + { 2, TF, sys_umount2, "umount2" }, /* 52 */ { 0, 0, sys_lock, "lock" }, /* 53 */ { 3, TD, sys_ioctl, "ioctl" }, /* 54 */ { 3, TD, sys_fcntl, "fcntl" }, /* 55 */ diff --git a/linux/avr32/syscallent.h b/linux/avr32/syscallent.h index de2e579f..9f6f06b8 100644 --- a/linux/avr32/syscallent.h +++ b/linux/avr32/syscallent.h @@ -47,7 +47,7 @@ { 5, TD, sys_llseek, "_llseek" }, /* 19 */ { 0, 0, sys_getpid, "getpid" }, /* 20 */ { 5, TF, sys_mount, "mount" }, /* 21 */ - { 2, TF, sys_umount, "umount" }, /* 22 */ + { 1, TF, sys_umount, "umount" }, /* 22 */ { 1, 0, sys_setuid, "setuid" }, /* 23 */ { 0, NF, sys_getuid, "getuid" }, /* 24 */ { 1, 0, sys_stime, "stime" }, /* 25 */ diff --git a/linux/bfin/syscallent.h b/linux/bfin/syscallent.h index 80832ed2..c79c58e9 100644 --- a/linux/bfin/syscallent.h +++ b/linux/bfin/syscallent.h @@ -48,7 +48,7 @@ { 3, TD, sys_lseek, "lseek" }, /* 19 */ { 0, 0, sys_getpid, "getpid" }, /* 20 */ { 5, TF, sys_mount, "mount" }, /* 21 */ - { 1, TF, sys_umount, "oldumount" }, /* 22 */ + { 1, TF, sys_umount, "umount" }, /* 22 */ { 1, 0, sys_setuid16, "setuid" }, /* 23 */ { 0, NF, sys_getuid16, "getuid" }, /* 24 */ { 1, 0, sys_stime, "stime" }, /* 25 */ @@ -78,7 +78,7 @@ { 0, NF, sys_geteuid16, "geteuid" }, /* 49 */ { 0, NF, sys_getegid16, "getegid" }, /* 50 */ { 1, TF, sys_acct, "acct" }, /* 51 */ - { 2, TF, sys_umount2, "umount" }, /* 52 */ + { 2, TF, sys_umount2, "umount2" }, /* 52 */ { 0, 0, sys_lock, "lock" }, /* 53 */ { 3, TD, sys_ioctl, "ioctl" }, /* 54 */ { 3, TD, sys_fcntl, "fcntl" }, /* 55 */ diff --git a/linux/i386/syscallent.h b/linux/i386/syscallent.h index d4357387..e71cde37 100644 --- a/linux/i386/syscallent.h +++ b/linux/i386/syscallent.h @@ -48,7 +48,7 @@ { 3, TD, sys_lseek, "lseek" }, /* 19 */ { 0, 0, sys_getpid, "getpid" }, /* 20 */ { 5, TF, sys_mount, "mount" }, /* 21 */ - { 1, TF, sys_umount, "oldumount" }, /* 22 */ + { 1, TF, sys_umount, "umount" }, /* 22 */ { 1, 0, sys_setuid16, "setuid" }, /* 23 */ { 0, NF, sys_getuid16, "getuid" }, /* 24 */ { 1, 0, sys_stime, "stime" }, /* 25 */ @@ -78,7 +78,7 @@ { 0, NF, sys_geteuid16, "geteuid" }, /* 49 */ { 0, NF, sys_getegid16, "getegid" }, /* 50 */ { 1, TF, sys_acct, "acct" }, /* 51 */ - { 2, TF, sys_umount2, "umount" }, /* 52 */ + { 2, TF, sys_umount2, "umount2" }, /* 52 */ { 0, 0, sys_lock, "lock" }, /* 53 */ { 3, TD, sys_ioctl, "ioctl" }, /* 54 */ { 3, TD, sys_fcntl, "fcntl" }, /* 55 */ diff --git a/linux/ia64/syscallent.h b/linux/ia64/syscallent.h index b7d7b075..e6b93056 100644 --- a/linux/ia64/syscallent.h +++ b/linux/ia64/syscallent.h @@ -835,7 +835,7 @@ { 0, 0, sys_getpid, "getpid" }, /* 1041 */ { 0, 0, sys_getppid, "getppid" }, /* 1042 */ { 5, TF, sys_mount, "mount" }, /* 1043 */ - { 1, TF, sys_umount2, "umount" }, /* 1044 */ + { 2, TF, sys_umount2, "umount" }, /* 1044 */ { 1, 0, sys_setuid, "setuid" }, /* 1045 */ { 0, NF, sys_getuid, "getuid" }, /* 1046 */ { 0, NF, sys_geteuid, "geteuid" }, /* 1047 */ diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h index 396794e2..b64c6687 100644 --- a/linux/m68k/syscallent.h +++ b/linux/m68k/syscallent.h @@ -48,7 +48,7 @@ { 3, TD, sys_lseek, "lseek" }, /* 19 */ { 0, 0, sys_getpid, "getpid" }, /* 20 */ { 5, TF, sys_mount, "mount" }, /* 21 */ - { 1, TF, sys_umount, "oldumount" }, /* 22 */ + { 1, TF, sys_umount, "umount" }, /* 22 */ { 1, 0, sys_setuid16, "setuid" }, /* 23 */ { 0, NF, sys_getuid16, "getuid" }, /* 24 */ { 1, 0, sys_stime, "stime" }, /* 25 */ @@ -78,7 +78,7 @@ { 0, NF, sys_geteuid16, "geteuid" }, /* 49 */ { 0, NF, sys_getegid16, "getegid" }, /* 50 */ { 1, TF, sys_acct, "acct" }, /* 51 */ - { 2, TF, sys_umount2, "umount" }, /* 52 */ + { 2, TF, sys_umount2, "umount2" }, /* 52 */ { 0, 0, sys_lock, "lock" }, /* 53 */ { 3, TD, sys_ioctl, "ioctl" }, /* 54 */ { 3, TD, sys_fcntl, "fcntl" }, /* 55 */ diff --git a/linux/metag/syscallent.h b/linux/metag/syscallent.h index 9fbed047..ac868a0f 100644 --- a/linux/metag/syscallent.h +++ b/linux/metag/syscallent.h @@ -37,7 +37,7 @@ { 3, TD|TF, sys_symlinkat, "symlinkat" }, /* 36 */ { 5, TD|TF, sys_linkat, "linkat" }, /* 37 */ { 4, TD|TF, sys_renameat, "renameat" }, /* 38 */ - { 2, TF, sys_umount2, "umount" }, /* 39 */ + { 2, TF, sys_umount2, "umount2" }, /* 39 */ { 5, TF, sys_mount, "mount" }, /* 40 */ { 2, TF, sys_pivotroot, "pivot_root" }, /* 41 */ { 3, 0, sys_nfsservctl, "nfsservctl" }, /* 42 */ diff --git a/linux/microblaze/syscallent.h b/linux/microblaze/syscallent.h index 8b0a6e0c..e292afb5 100644 --- a/linux/microblaze/syscallent.h +++ b/linux/microblaze/syscallent.h @@ -48,7 +48,7 @@ { 3, TD, sys_lseek, "lseek" }, /* 19 */ { 0, 0, sys_getpid, "getpid" }, /* 20 */ { 5, TF, sys_mount, "mount" }, /* 21 */ - { 1, TF, sys_umount, "oldumount" }, /* 22 */ + { 1, TF, sys_umount, "umount" }, /* 22 */ { 1, 0, sys_setuid16, "setuid" }, /* 23 */ { 0, NF, sys_getuid16, "getuid" }, /* 24 */ { 1, 0, sys_stime, "stime" }, /* 25 */ @@ -78,7 +78,7 @@ { 0, NF, sys_geteuid16, "geteuid" }, /* 49 */ { 0, NF, sys_getegid16, "getegid" }, /* 50 */ { 1, TF, sys_acct, "acct" }, /* 51 */ - { 2, TF, sys_umount2, "umount" }, /* 52 */ + { 2, TF, sys_umount2, "umount2" }, /* 52 */ { 0, 0, sys_lock, "lock" }, /* 53 */ { 3, TD, sys_ioctl, "ioctl" }, /* 54 */ { 3, TD, sys_fcntl, "fcntl" }, /* 55 */ diff --git a/linux/or1k/syscallent.h b/linux/or1k/syscallent.h index 30fe2388..8f636769 100644 --- a/linux/or1k/syscallent.h +++ b/linux/or1k/syscallent.h @@ -37,7 +37,7 @@ { 3, TD|TF, sys_symlinkat, "symlinkat" }, /* 36 */ { 5, TD|TF, sys_linkat, "linkat" }, /* 37 */ { 4, TD|TF, sys_renameat, "renameat" }, /* 38 */ - { 2, TF, sys_umount2, "umount" }, /* 39 */ + { 2, TF, sys_umount2, "umount2" }, /* 39 */ { 5, TF, sys_mount, "mount" }, /* 40 */ { 2, TF, sys_pivotroot, "pivot_root" }, /* 41 */ { 3, 0, sys_nfsservctl, "nfsservctl" }, /* 42 */ diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h index 93930735..06167c85 100644 --- a/linux/powerpc/syscallent.h +++ b/linux/powerpc/syscallent.h @@ -48,7 +48,7 @@ { 3, TD, sys_lseek, "lseek" }, /* 19 */ { 0, 0, sys_getpid, "getpid" }, /* 20 */ { 5, TF, sys_mount, "mount" }, /* 21 */ - { 1, TF, sys_umount, "oldumount" }, /* 22 */ + { 1, TF, sys_umount, "umount" }, /* 22 */ { 1, 0, sys_setuid, "setuid" }, /* 23 */ { 0, NF, sys_getuid, "getuid" }, /* 24 */ { 1, 0, sys_stime, "stime" }, /* 25 */ @@ -78,7 +78,7 @@ { 0, NF, sys_geteuid, "geteuid" }, /* 49 */ { 0, NF, sys_getegid, "getegid" }, /* 50 */ { 1, TF, sys_acct, "acct" }, /* 51 */ - { 2, TF, sys_umount2, "umount" }, /* 52 */ + { 2, TF, sys_umount2, "umount2" }, /* 52 */ { 0, 0, sys_lock, "lock" }, /* 53 */ { 3, TD, sys_ioctl, "ioctl" }, /* 54 */ { 3, TD, sys_fcntl, "fcntl" }, /* 55 */ diff --git a/linux/s390/syscallent.h b/linux/s390/syscallent.h index f91b805e..9e51b9c5 100644 --- a/linux/s390/syscallent.h +++ b/linux/s390/syscallent.h @@ -50,7 +50,7 @@ { 3, TD, sys_lseek, "lseek" }, /* 19 */ { 0, 0, sys_getpid, "getpid" }, /* 20 */ { 5, TF, sys_mount, "mount" }, /* 21 */ - { 1, TF, sys_umount, "oldumount" }, /* 22 */ + { 1, TF, sys_umount, "umount" }, /* 22 */ { 1, 0, sys_setuid16, "setuid" }, /* 23 */ { 0, NF, sys_getuid16, "getuid" }, /* 24 */ { 1, 0, sys_stime, "stime" }, /* 25 */ @@ -80,7 +80,7 @@ { 0, NF, sys_geteuid16, "geteuid" }, /* 49 */ { 0, NF, sys_getegid16, "getegid" }, /* 50 */ { 1, TF, sys_acct, "acct" }, /* 51 */ - { 2, TF, sys_umount2, "umount" }, /* 52 */ + { 2, TF, sys_umount2, "umount2" }, /* 52 */ { MA, 0, NULL, NULL }, /* 53 */ { 3, TD, sys_ioctl, "ioctl" }, /* 54 */ { 3, TD, sys_fcntl, "fcntl" }, /* 55 */ diff --git a/linux/s390x/syscallent.h b/linux/s390x/syscallent.h index 99bf90bc..048188c3 100644 --- a/linux/s390x/syscallent.h +++ b/linux/s390x/syscallent.h @@ -49,7 +49,7 @@ { 3, TD, sys_lseek, "lseek" }, /* 19 */ { 0, 0, sys_getpid, "getpid" }, /* 20 */ { 5, TF, sys_mount, "mount" }, /* 21 */ - { 1, TF, sys_umount, "oldumount" }, /* 22 */ + { 1, TF, sys_umount, "umount" }, /* 22 */ { MA, 0, NULL, NULL }, /* 23 */ { MA, 0, NULL, NULL }, /* 24 */ { MA, 0, NULL, NULL }, /* 25 */ @@ -79,7 +79,7 @@ { MA, 0, NULL, NULL }, /* 49 */ { MA, 0, NULL, NULL }, /* 50 */ { 1, TF, sys_acct, "acct" }, /* 51 */ - { 2, TF, sys_umount2, "umount" }, /* 52 */ + { 2, TF, sys_umount2, "umount2" }, /* 52 */ { MA, 0, NULL, NULL }, /* 53 */ { 3, TD, sys_ioctl, "ioctl" }, /* 54 */ { 3, TD, sys_fcntl, "fcntl" }, /* 55 */ diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h index ee061c3e..74347d3f 100644 --- a/linux/sh/syscallent.h +++ b/linux/sh/syscallent.h @@ -50,7 +50,7 @@ { 3, TD, sys_lseek, "lseek" }, /* 19 */ { 0, 0, sys_getpid, "getpid" }, /* 20 */ { 5, TF, sys_mount, "mount" }, /* 21 */ - { 1, TF, sys_umount, "oldumount" }, /* 22 */ + { 1, TF, sys_umount, "umount" }, /* 22 */ { 1, 0, sys_setuid16, "setuid" }, /* 23 */ { 0, NF, sys_getuid16, "getuid" }, /* 24 */ { 1, 0, sys_stime, "stime" }, /* 25 */ @@ -80,7 +80,7 @@ { 0, NF, sys_geteuid16, "geteuid" }, /* 49 */ { 0, NF, sys_getegid16, "getegid" }, /* 50 */ { 1, TF, sys_acct, "acct" }, /* 51 */ - { 2, TF, sys_umount2, "umount" }, /* 52 */ + { 2, TF, sys_umount2, "umount2" }, /* 52 */ { 0, 0, sys_lock, "lock" }, /* 53 */ { 3, TD, sys_ioctl, "ioctl" }, /* 54 */ { 3, TD, sys_fcntl, "fcntl" }, /* 55 */ diff --git a/linux/sh64/syscallent.h b/linux/sh64/syscallent.h index 0a454937..94d4b008 100644 --- a/linux/sh64/syscallent.h +++ b/linux/sh64/syscallent.h @@ -48,7 +48,7 @@ { 3, TD, sys_lseek, "lseek" }, /* 19 */ { 0, 0, sys_getpid, "getpid" }, /* 20 */ { 5, TF, sys_mount, "mount" }, /* 21 */ - { 1, TF, sys_umount, "oldumount" }, /* 22 */ + { 1, TF, sys_umount, "umount" }, /* 22 */ { 1, 0, sys_setuid16, "setuid" }, /* 23 */ { 0, NF, sys_getuid16, "getuid" }, /* 24 */ { 1, 0, sys_stime, "stime" }, /* 25 */ @@ -78,7 +78,7 @@ { 0, NF, sys_geteuid16, "geteuid" }, /* 49 */ { 0, NF, sys_getegid16, "getegid" }, /* 50 */ { 1, TF, sys_acct, "acct" }, /* 51 */ - { 2, TF, sys_umount2, "umount" }, /* 52 */ + { 2, TF, sys_umount2, "umount2" }, /* 52 */ { 0, 0, sys_lock, "lock" }, /* 53 */ { 3, TD, sys_ioctl, "ioctl" }, /* 54 */ { 3, TD, sys_fcntl, "fcntl" }, /* 55 */ diff --git a/linux/sparc/syscallent.h b/linux/sparc/syscallent.h index 792c56c8..c601543e 100644 --- a/linux/sparc/syscallent.h +++ b/linux/sparc/syscallent.h @@ -43,7 +43,7 @@ { 0, TD, sys_pipe, "pipe" }, /* 42 */ { 1, 0, sys_times, "times" }, /* 43 */ { 0, NF, sys_getuid, "getuid32" }, /* 44 */ - { 2, TF, sys_umount2, "umount" }, /* 45 */ + { 2, TF, sys_umount2, "umount2" }, /* 45 */ { 1, 0, sys_setgid16, "setgid" }, /* 46 */ { 0, NF, sys_getgid16, "getgid" }, /* 47 */ { 3, TS, sys_signal, "signal" }, /* 48 */ @@ -157,7 +157,7 @@ { 4, 0, printargs, "getdirentries" }, /* 156 */ { 2, TF, sys_statfs, "statfs" }, /* 157 */ { 2, TD, sys_fstatfs, "fstatfs" }, /* 158 */ - { 1, TF, sys_umount, "oldumount" }, /* 159 */ + { 1, TF, sys_umount, "umount" }, /* 159 */ { 3, 0, sys_sched_setaffinity, "sched_setaffinity" },/* 160 */ { 3, 0, sys_sched_getaffinity, "sched_getaffinity" },/* 161 */ { 2, 0, printargs, "getdomainname" }, /* 162 */ diff --git a/linux/x32/syscallent.h b/linux/x32/syscallent.h index 964991b1..207639d3 100644 --- a/linux/x32/syscallent.h +++ b/linux/x32/syscallent.h @@ -164,7 +164,7 @@ { 1, TF, sys_acct, "acct" }, /* 163 */ { 2, 0, sys_settimeofday, "settimeofday" }, /* 164 */ { 5, TF, sys_mount, "mount" }, /* 165 */ - { 2, TF, sys_umount2, "umount" }, /* 166 */ + { 2, TF, sys_umount2, "umount2" }, /* 166 */ { 2, TF, sys_swapon, "swapon" }, /* 167 */ { 1, TF, sys_swapoff, "swapoff" }, /* 168 */ { 4, 0, sys_reboot, "reboot" }, /* 169 */ diff --git a/linux/x86_64/syscallent.h b/linux/x86_64/syscallent.h index ed497f82..8cf86fba 100644 --- a/linux/x86_64/syscallent.h +++ b/linux/x86_64/syscallent.h @@ -164,7 +164,7 @@ { 1, TF, sys_acct, "acct" }, /* 163 */ { 2, 0, sys_settimeofday, "settimeofday" }, /* 164 */ { 5, TF, sys_mount, "mount" }, /* 165 */ - { 2, TF, sys_umount2, "umount" }, /* 166 */ + { 2, TF, sys_umount2, "umount2" }, /* 166 */ { 2, TF, sys_swapon, "swapon" }, /* 167 */ { 1, TF, sys_swapoff, "swapoff" }, /* 168 */ { 4, 0, sys_reboot, "reboot" }, /* 169 */ diff --git a/linux/xtensa/syscallent.h b/linux/xtensa/syscallent.h index ead5fcc6..c829d418 100644 --- a/linux/xtensa/syscallent.h +++ b/linux/xtensa/syscallent.h @@ -168,7 +168,7 @@ { 2, TF, sys_swapon, "swapon" }, /* 173 */ { 1, TF, sys_chroot, "chroot" }, /* 174 */ { 2, TF, sys_pivotroot, "pivot_root" }, /* 175 */ - { 2, TF, sys_umount, "umount" }, /* 176 */ + { 1, TF, sys_umount, "umount" }, /* 176 */ { 1, TF, sys_swapoff, "swapoff" }, /* 177 */ { 0, 0, sys_sync, "sync" }, /* 178 */ [179] = { }, -- 2.40.0