From 5da0c2c3b175c1217e5e4890c898628ca2a6bd22 Mon Sep 17 00:00:00 2001 From: Manfred Spraul Date: Sun, 22 Feb 2004 21:28:40 -0800 Subject: [PATCH] [PATCH] rename shmat to make it clear it isn't a system call entrypoint This renames sys_shmat to do_shmat. Additionally, I've replaced the cond_syscall with a conditional inline function. It touches all archs - only i386 is tested. --- arch/alpha/kernel/osf_sys.c | 2 +- arch/arm/kernel/sys_arm.c | 4 ++-- arch/arm26/kernel/sys_arm.c | 4 ++-- arch/cris/kernel/sys_cris.c | 2 +- arch/h8300/kernel/sys_h8300.c | 2 +- arch/i386/kernel/sys_i386.c | 4 ++-- arch/ia64/ia32/sys_ia32.c | 2 +- arch/ia64/kernel/sys_ia64.c | 2 +- arch/m68k/kernel/sys_m68k.c | 2 +- arch/mips/kernel/linux32.c | 2 +- arch/mips/kernel/syscall.c | 4 ++-- arch/mips/kernel/sysirix.c | 2 +- arch/parisc/kernel/sys_parisc.c | 2 +- arch/ppc/kernel/syscalls.c | 2 +- arch/ppc64/kernel/sys_ppc32.c | 2 +- arch/ppc64/kernel/syscalls.c | 4 ++-- arch/s390/kernel/compat_linux.c | 2 +- arch/s390/kernel/sys_s390.c | 2 +- arch/sh/kernel/sys_sh.c | 4 ++-- arch/sparc/kernel/sys_sparc.c | 4 ++-- arch/sparc/kernel/sys_sunos.c | 4 ++-- arch/sparc64/kernel/sys_sparc.c | 2 +- arch/sparc64/kernel/sys_sparc32.c | 2 +- arch/sparc64/kernel/sys_sunos32.c | 4 ++-- arch/um/kernel/syscall_kern.c | 4 ++-- arch/v850/kernel/syscalls.c | 4 ++-- arch/x86_64/ia32/ipc32.c | 2 +- arch/x86_64/kernel/sys_x86_64.c | 4 ++-- include/linux/shm.h | 9 ++++++++- ipc/shm.c | 2 +- kernel/sys.c | 1 - 31 files changed, 49 insertions(+), 43 deletions(-) diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index bd0e69f0532e8..4f25f91ae5462 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -464,7 +464,7 @@ osf_shmat(int shmid, void *shmaddr, int shmflg) unsigned long raddr; long err; - err = sys_shmat(shmid, shmaddr, shmflg, &raddr); + err = do_shmat(shmid, shmaddr, shmflg, &raddr); /* * This works because all user-level addresses are diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c index 364efedbe884a..699d5ceb253ba 100644 --- a/arch/arm/kernel/sys_arm.c +++ b/arch/arm/kernel/sys_arm.c @@ -210,7 +210,7 @@ asmlinkage int sys_ipc (uint call, int first, int second, int third, void *ptr, switch (version) { default: { ulong raddr; - ret = sys_shmat (first, (char *) ptr, second, &raddr); + ret = do_shmat (first, (char *) ptr, second, &raddr); if (ret) return ret; return put_user (raddr, (ulong *) third); @@ -218,7 +218,7 @@ asmlinkage int sys_ipc (uint call, int first, int second, int third, void *ptr, case 1: /* iBCS2 emulator entry point */ if (!segment_eq(get_fs(), get_ds())) return -EINVAL; - return sys_shmat (first, (char *) ptr, + return do_shmat (first, (char *) ptr, second, (ulong *) third); } case SHMDT: diff --git a/arch/arm26/kernel/sys_arm.c b/arch/arm26/kernel/sys_arm.c index e1537d3051172..92c522ee0a00d 100644 --- a/arch/arm26/kernel/sys_arm.c +++ b/arch/arm26/kernel/sys_arm.c @@ -211,7 +211,7 @@ asmlinkage int sys_ipc (uint call, int first, int second, int third, void *ptr, switch (version) { default: { ulong raddr; - ret = sys_shmat (first, (char *) ptr, second, &raddr); + ret = do_shmat (first, (char *) ptr, second, &raddr); if (ret) return ret; return put_user (raddr, (ulong *) third); @@ -219,7 +219,7 @@ asmlinkage int sys_ipc (uint call, int first, int second, int third, void *ptr, case 1: /* iBCS2 emulator entry point */ if (!segment_eq(get_fs(), get_ds())) return -EINVAL; - return sys_shmat (first, (char *) ptr, + return do_shmat (first, (char *) ptr, second, (ulong *) third); } case SHMDT: diff --git a/arch/cris/kernel/sys_cris.c b/arch/cris/kernel/sys_cris.c index e7e5c04071e56..711669e44f8b8 100644 --- a/arch/cris/kernel/sys_cris.c +++ b/arch/cris/kernel/sys_cris.c @@ -155,7 +155,7 @@ asmlinkage int sys_ipc (uint call, int first, int second, case SHMAT: { ulong raddr; - ret = sys_shmat (first, (char __user *) ptr, second, &raddr); + ret = do_shmat (first, (char __user *) ptr, second, &raddr); if (ret) return ret; return put_user (raddr, (ulong __user *) third); diff --git a/arch/h8300/kernel/sys_h8300.c b/arch/h8300/kernel/sys_h8300.c index 22f13f7f38c17..3251d06723611 100644 --- a/arch/h8300/kernel/sys_h8300.c +++ b/arch/h8300/kernel/sys_h8300.c @@ -240,7 +240,7 @@ asmlinkage int sys_ipc (uint call, int first, int second, switch (version) { default: { ulong raddr; - ret = sys_shmat (first, (char *) ptr, + ret = do_shmat (first, (char *) ptr, second, &raddr); if (ret) return ret; diff --git a/arch/i386/kernel/sys_i386.c b/arch/i386/kernel/sys_i386.c index 2f6d63bcead40..daafafb9e5292 100644 --- a/arch/i386/kernel/sys_i386.c +++ b/arch/i386/kernel/sys_i386.c @@ -186,7 +186,7 @@ asmlinkage int sys_ipc (uint call, int first, int second, switch (version) { default: { ulong raddr; - ret = sys_shmat (first, (char __user *) ptr, second, &raddr); + ret = do_shmat (first, (char __user *) ptr, second, &raddr); if (ret) return ret; return put_user (raddr, (ulong __user *) third); @@ -195,7 +195,7 @@ asmlinkage int sys_ipc (uint call, int first, int second, if (!segment_eq(get_fs(), get_ds())) return -EINVAL; /* The "(ulong *) third" is valid _only_ because of the kernel segment thing */ - return sys_shmat (first, (char __user *) ptr, second, (ulong *) third); + return do_shmat (first, (char __user *) ptr, second, (ulong *) third); } case SHMDT: return sys_shmdt ((char __user *)ptr); diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c index 7fd71cb772235..b2c9c7778835b 100644 --- a/arch/ia64/ia32/sys_ia32.c +++ b/arch/ia64/ia32/sys_ia32.c @@ -1447,7 +1447,7 @@ shmat32 (int first, int second, int third, int version, void *uptr) if (version == 1) return -EINVAL; /* iBCS2 emulator entry point: unsupported */ - err = sys_shmat(first, uptr, second, &raddr); + err = do_shmat(first, uptr, second, &raddr); if (err) return err; return put_user(raddr, uaddr); diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c index 380b1fcb21dd7..9ae1a1ab4807b 100644 --- a/arch/ia64/kernel/sys_ia64.c +++ b/arch/ia64/kernel/sys_ia64.c @@ -98,7 +98,7 @@ ia64_shmat (int shmid, void *shmaddr, int shmflg) unsigned long raddr; int retval; - retval = sys_shmat(shmid, shmaddr, shmflg, &raddr); + retval = do_shmat(shmid, shmaddr, shmflg, &raddr); if (retval < 0) return retval; diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c index 02c34dd749471..7db3b40cb85c0 100644 --- a/arch/m68k/kernel/sys_m68k.c +++ b/arch/m68k/kernel/sys_m68k.c @@ -241,7 +241,7 @@ asmlinkage int sys_ipc (uint call, int first, int second, switch (version) { default: { ulong raddr; - ret = sys_shmat (first, (char *) ptr, + ret = do_shmat (first, (char *) ptr, second, &raddr); if (ret) return ret; diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 2691fd2dfcae2..47f18c2434670 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c @@ -1460,7 +1460,7 @@ do_sys32_shmat (int first, int second, int third, int version, void *uptr) if (version == 1) return err; - err = sys_shmat (first, uptr, second, &raddr); + err = do_shmat (first, uptr, second, &raddr); if (err) return err; err = put_user (raddr, uaddr); diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c index 8dd2d7cb90f97..2e11b8e7b0e79 100644 --- a/arch/mips/kernel/syscall.c +++ b/arch/mips/kernel/syscall.c @@ -342,7 +342,7 @@ asmlinkage int sys_ipc (uint call, int first, int second, switch (version) { default: { ulong raddr; - ret = sys_shmat (first, (char *) ptr, second, &raddr); + ret = do_shmat (first, (char *) ptr, second, &raddr); if (ret) return ret; return put_user (raddr, (ulong *) third); @@ -350,7 +350,7 @@ asmlinkage int sys_ipc (uint call, int first, int second, case 1: /* iBCS2 emulator entry point */ if (!segment_eq(get_fs(), get_ds())) return -EINVAL; - return sys_shmat (first, (char *) ptr, second, (ulong *) third); + return do_shmat (first, (char *) ptr, second, (ulong *) third); } case SHMDT: return sys_shmdt ((char *)ptr); diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c index 9b4a28149fb4d..e8827b397b451 100644 --- a/arch/mips/kernel/sysirix.c +++ b/arch/mips/kernel/sysirix.c @@ -968,7 +968,7 @@ asmlinkage int irix_shmsys(int opcode, unsigned long arg0, unsigned long arg1, { switch (opcode) { case 0: - return sys_shmat((int) arg0, (char *)arg1, (int) arg2, + return do_shmat((int) arg0, (char *)arg1, (int) arg2, (unsigned long *) arg3); case 1: return sys_shmctl((int)arg0, (int)arg1, (struct shmid_ds *)arg2); diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c index de869530c9b64..a5690e6f10fdf 100644 --- a/arch/parisc/kernel/sys_parisc.c +++ b/arch/parisc/kernel/sys_parisc.c @@ -173,7 +173,7 @@ long sys_shmat_wrapper(int shmid, char *shmaddr, int shmflag) unsigned long raddr; int r; - r = sys_shmat(shmid, shmaddr, shmflag, &raddr); + r = do_shmat(shmid, shmaddr, shmflag, &raddr); if (r < 0) return r; return raddr; diff --git a/arch/ppc/kernel/syscalls.c b/arch/ppc/kernel/syscalls.c index 2f0f5778538c1..e68cdf8da02c2 100644 --- a/arch/ppc/kernel/syscalls.c +++ b/arch/ppc/kernel/syscalls.c @@ -119,7 +119,7 @@ sys_ipc (uint call, int first, int second, int third, void __user *ptr, long fif if ((ret = verify_area(VERIFY_WRITE, (ulong __user *) third, sizeof(ulong)))) break; - ret = sys_shmat (first, (char __user *) ptr, second, &raddr); + ret = do_shmat (first, (char __user *) ptr, second, &raddr); if (ret) break; ret = put_user (raddr, (ulong __user *) third); diff --git a/arch/ppc64/kernel/sys_ppc32.c b/arch/ppc64/kernel/sys_ppc32.c index dc0bb4e90ae87..b087f270c0c22 100644 --- a/arch/ppc64/kernel/sys_ppc32.c +++ b/arch/ppc64/kernel/sys_ppc32.c @@ -1649,7 +1649,7 @@ do_sys32_shmat(int first, int second, int third, int version, void *uptr) if (version == 1) return err; - err = sys_shmat(first, uptr, second, &raddr); + err = do_shmat(first, uptr, second, &raddr); if (err) return err; err = put_user(raddr, uaddr); diff --git a/arch/ppc64/kernel/syscalls.c b/arch/ppc64/kernel/syscalls.c index deb4b65467116..957506386b636 100644 --- a/arch/ppc64/kernel/syscalls.c +++ b/arch/ppc64/kernel/syscalls.c @@ -122,7 +122,7 @@ sys_ipc (uint call, int first, int second, long third, void *ptr, long fifth) switch (version) { default: { ulong raddr; - ret = sys_shmat (first, (char *) ptr, second, &raddr); + ret = do_shmat (first, (char *) ptr, second, &raddr); if (ret) break; ret = put_user (raddr, (ulong *) third); @@ -132,7 +132,7 @@ sys_ipc (uint call, int first, int second, long third, void *ptr, long fifth) ret = -EINVAL; if (!segment_eq(get_fs(), get_ds())) break; - ret = sys_shmat (first, (char *) ptr, second, + ret = do_shmat (first, (char *) ptr, second, (ulong *) third); break; } diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c index a28ea842868fa..4f06ba172646c 100644 --- a/arch/s390/kernel/compat_linux.c +++ b/arch/s390/kernel/compat_linux.c @@ -721,7 +721,7 @@ static int do_sys32_shmat (int first, int second, int third, int version, void * if (version == 1) goto out; - err = sys_shmat (first, uptr, second, &raddr); + err = do_shmat (first, uptr, second, &raddr); if (err) goto out; err = put_user (raddr, uaddr); diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c index b21c19b8ab680..03159cb820bee 100644 --- a/arch/s390/kernel/sys_s390.c +++ b/arch/s390/kernel/sys_s390.c @@ -225,7 +225,7 @@ asmlinkage __SYS_RETTYPE sys_ipc (uint call, int first, int second, case SHMAT: { ulong raddr; - ret = sys_shmat (first, (char *) ptr, second, &raddr); + ret = do_shmat (first, (char *) ptr, second, &raddr); if (ret) return ret; return put_user (raddr, (ulong *) third); diff --git a/arch/sh/kernel/sys_sh.c b/arch/sh/kernel/sys_sh.c index 0b9ead279bc3f..6134da3bafbce 100644 --- a/arch/sh/kernel/sys_sh.c +++ b/arch/sh/kernel/sys_sh.c @@ -200,7 +200,7 @@ asmlinkage int sys_ipc(uint call, int first, int second, switch (version) { default: { ulong raddr; - ret = sys_shmat (first, (char __user *) ptr, + ret = do_shmat (first, (char __user *) ptr, second, &raddr); if (ret) return ret; @@ -209,7 +209,7 @@ asmlinkage int sys_ipc(uint call, int first, int second, case 1: /* iBCS2 emulator entry point */ if (!segment_eq(get_fs(), get_ds())) return -EINVAL; - return sys_shmat (first, (char __user *) ptr, + return do_shmat (first, (char __user *) ptr, second, (ulong *) third); } case SHMDT: diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c index 347f4652066cb..b05ac5f77c16e 100644 --- a/arch/sparc/kernel/sys_sparc.c +++ b/arch/sparc/kernel/sys_sparc.c @@ -185,7 +185,7 @@ asmlinkage int sys_ipc (uint call, int first, int second, int third, void __user switch (version) { case 0: default: { ulong raddr; - err = sys_shmat (first, (char __user *) ptr, second, &raddr); + err = do_shmat (first, (char __user *) ptr, second, &raddr); if (err) goto out; err = -EFAULT; @@ -195,7 +195,7 @@ asmlinkage int sys_ipc (uint call, int first, int second, int third, void __user goto out; } case 1: /* iBCS2 emulator entry point */ - err = sys_shmat (first, (char __user *) ptr, second, (ulong __user *) third); + err = do_shmat (first, (char __user *) ptr, second, (ulong __user *) third); goto out; } case SHMDT: diff --git a/arch/sparc/kernel/sys_sunos.c b/arch/sparc/kernel/sys_sunos.c index 65a98e403eb8b..f8ff961c9ae21 100644 --- a/arch/sparc/kernel/sys_sunos.c +++ b/arch/sparc/kernel/sys_sunos.c @@ -1006,8 +1006,8 @@ asmlinkage int sunos_shmsys(int op, unsigned long arg1, unsigned long arg2, switch(op) { case 0: - /* sys_shmat(): attach a shared memory area */ - rval = sys_shmat((int)arg1,(char *)arg2,(int)arg3,&raddr); + /* do_shmat(): attach a shared memory area */ + rval = do_shmat((int)arg1,(char *)arg2,(int)arg3,&raddr); if(!rval) rval = (int) raddr; break; diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c index 07464a72e907a..7c4c3e3d40bb6 100644 --- a/arch/sparc64/kernel/sys_sparc.c +++ b/arch/sparc64/kernel/sys_sparc.c @@ -254,7 +254,7 @@ asmlinkage int sys_ipc (unsigned call, int first, int second, unsigned long thir switch (call) { case SHMAT: { ulong raddr; - err = sys_shmat (first, (char *) ptr, second, &raddr); + err = do_shmat (first, (char *) ptr, second, &raddr); if (!err) { if (put_user(raddr, (ulong __user *) third)) err = -EFAULT; diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c index f825984dd4b42..80dff7d45a84b 100644 --- a/arch/sparc64/kernel/sys_sparc32.c +++ b/arch/sparc64/kernel/sys_sparc32.c @@ -642,7 +642,7 @@ static int do_sys32_shmat (int first, int second, int third, int version, void * if (version == 1) goto out; - err = sys_shmat (first, uptr, second, &raddr); + err = do_shmat (first, uptr, second, &raddr); if (err) goto out; err = put_user (raddr, uaddr); diff --git a/arch/sparc64/kernel/sys_sunos32.c b/arch/sparc64/kernel/sys_sunos32.c index 69104cdae35e0..b3dc8a973a4f4 100644 --- a/arch/sparc64/kernel/sys_sunos32.c +++ b/arch/sparc64/kernel/sys_sunos32.c @@ -1139,8 +1139,8 @@ asmlinkage int sunos_shmsys(int op, u32 arg1, u32 arg2, u32 arg3) switch(op) { case 0: - /* sys_shmat(): attach a shared memory area */ - rval = sys_shmat((int)arg1,(char *)A(arg2),(int)arg3,&raddr); + /* do_shmat(): attach a shared memory area */ + rval = do_shmat((int)arg1,(char *)A(arg2),(int)arg3,&raddr); if(!rval) rval = (int) raddr; break; diff --git a/arch/um/kernel/syscall_kern.c b/arch/um/kernel/syscall_kern.c index bcebea22c9405..c8dcc43f6818a 100644 --- a/arch/um/kernel/syscall_kern.c +++ b/arch/um/kernel/syscall_kern.c @@ -235,7 +235,7 @@ int sys_ipc (uint call, int first, int second, switch (version) { default: { ulong raddr; - ret = sys_shmat (first, (char *) ptr, second, &raddr); + ret = do_shmat (first, (char *) ptr, second, &raddr); if (ret) return ret; return put_user (raddr, (ulong *) third); @@ -243,7 +243,7 @@ int sys_ipc (uint call, int first, int second, case 1: /* iBCS2 emulator entry point */ if (!segment_eq(get_fs(), get_ds())) return -EINVAL; - return sys_shmat (first, (char *) ptr, second, (ulong *) third); + return do_shmat (first, (char *) ptr, second, (ulong *) third); } case SHMDT: return sys_shmdt ((char *)ptr); diff --git a/arch/v850/kernel/syscalls.c b/arch/v850/kernel/syscalls.c index 40f17546696e2..15fa9c2098184 100644 --- a/arch/v850/kernel/syscalls.c +++ b/arch/v850/kernel/syscalls.c @@ -106,7 +106,7 @@ sys_ipc (uint call, int first, int second, int third, void *ptr, long fifth) if ((ret = verify_area(VERIFY_WRITE, (ulong*) third, sizeof(ulong)))) break; - ret = sys_shmat (first, (char *) ptr, second, &raddr); + ret = do_shmat (first, (char *) ptr, second, &raddr); if (ret) break; ret = put_user (raddr, (ulong *) third); @@ -115,7 +115,7 @@ sys_ipc (uint call, int first, int second, int third, void *ptr, long fifth) case 1: /* iBCS2 emulator entry point */ if (!segment_eq(get_fs(), get_ds())) break; - ret = sys_shmat (first, (char *) ptr, second, + ret = do_shmat (first, (char *) ptr, second, (ulong *) third); break; } diff --git a/arch/x86_64/ia32/ipc32.c b/arch/x86_64/ia32/ipc32.c index 838dd57a57ae7..d9b96624da0f7 100644 --- a/arch/x86_64/ia32/ipc32.c +++ b/arch/x86_64/ia32/ipc32.c @@ -457,7 +457,7 @@ shmat32 (int first, int second, int third, int version, void *uptr) if (version == 1) return -EINVAL; /* iBCS2 emulator entry point: unsupported */ - err = sys_shmat(first, uptr, second, &raddr); + err = do_shmat(first, uptr, second, &raddr); if (err) return err; return put_user(raddr, uaddr); diff --git a/arch/x86_64/kernel/sys_x86_64.c b/arch/x86_64/kernel/sys_x86_64.c index 366c886b96383..fe7b5129fb8b5 100644 --- a/arch/x86_64/kernel/sys_x86_64.c +++ b/arch/x86_64/kernel/sys_x86_64.c @@ -155,8 +155,8 @@ asmlinkage long sys_uname(struct new_utsname * name) asmlinkage long wrap_sys_shmat(int shmid, char *shmaddr, int shmflg) { unsigned long raddr; - return sys_shmat(shmid,shmaddr,shmflg,&raddr) ?: (long)raddr; -} + return do_shmat(shmid,shmaddr,shmflg,&raddr) ?: (long)raddr; +} asmlinkage long sys_time64(long * tloc) { diff --git a/include/linux/shm.h b/include/linux/shm.h index dd0cafabdc1c4..69698d3440532 100644 --- a/include/linux/shm.h +++ b/include/linux/shm.h @@ -90,7 +90,14 @@ struct shmid_kernel /* private to the kernel */ #define SHM_LOCKED 02000 /* segment will not be swapped */ #define SHM_HUGETLB 04000 /* segment will use huge TLB pages */ -long sys_shmat (int shmid, char __user *shmaddr, int shmflg, unsigned long *addr); +#ifdef CONFIG_SYSVIPC +long do_shmat (int shmid, char __user *shmaddr, int shmflg, unsigned long *addr); +#else +inline long do_shmat (int shmid, char __user *shmaddr, int shmflg, unsigned long *addr) +{ + return -ENOSYS; +} +#endif asmlinkage long sys_shmget (key_t key, size_t size, int flag); asmlinkage long sys_shmdt (char __user *shmaddr); asmlinkage long sys_shmctl (int shmid, int cmd, struct shmid_ds __user *buf); diff --git a/ipc/shm.c b/ipc/shm.c index 4260a6d53c83a..f5eadc2747ca9 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -635,7 +635,7 @@ out: * "raddr" thing points to kernel space, and there has to be a wrapper around * this. */ -asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr) +long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr) { struct shmid_kernel *shp; unsigned long addr; diff --git a/kernel/sys.c b/kernel/sys.c index af74b802c5d12..33a14e13079e0 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -258,7 +258,6 @@ cond_syscall(sys_msgsnd) cond_syscall(sys_msgrcv) cond_syscall(sys_msgctl) cond_syscall(sys_shmget) -cond_syscall(sys_shmat) cond_syscall(sys_shmdt) cond_syscall(sys_shmctl) -- 2.53.0