[PATCH] consolidate sys_shmat (7d87e14c) · Commits · 戴 / test

arch/alpha/kernel/osf_sys.c

+0 −16

Original line number	Diff line number	Diff line
		@@ -457,22 +457,6 @@ osf_getdomainname(char __user *name, int namelen)
		return 0;
		}

		asmlinkage long
		osf_shmat(int shmid, void __user *shmaddr, int shmflg)
		{
		unsigned long raddr;
		long err;

		err = do_shmat(shmid, shmaddr, shmflg, &raddr);

		/*
		* This works because all user-level addresses are
		* non-negative longs!
		*/
		return err ? err : (long)raddr;
		}


		/*
		* The following stuff should move into a header file should it ever
		* be labeled "officially supported." Right now, there is just enough

+1 −1

+0 −12

Original line number	Diff line number	Diff line
		@@ -227,18 +227,6 @@ asmlinkage int sys_ipc(uint call, int first, int second, int third,
		}
		}

		asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg,
		unsigned long __user *addr)
		{
		unsigned long ret;
		long err;

		err = do_shmat(shmid, shmaddr, shmflg, &ret);
		if (err == 0)
		err = put_user(ret, addr);
		return err;
		}

		/* Fork a new task - this creates a new program thread.
		* This is called indirectly via a small wrapper
		*/

+1 −1

+0 −14

Original line number	Diff line number	Diff line
		@@ -92,20 +92,6 @@ sys_getpagesize (void)
		return PAGE_SIZE;
		}

		asmlinkage unsigned long
		ia64_shmat (int shmid, void __user *shmaddr, int shmflg)
		{
		unsigned long raddr;
		int retval;

		retval = do_shmat(shmid, shmaddr, shmflg, &raddr);
		if (retval < 0)
		return retval;

		force_successful_syscall_return();
		return raddr;
		}

		asmlinkage unsigned long
		ia64_brk (unsigned long brk)
		{