Commit d6ca3890 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] fix shmat

From: Nick Piggin <piggin@cyberone.com.au>

sys_shmat() need to be declared asmlinkage.  This causes breakage when we
actually get the proper prototypes into caller's scope.
parent 7f22b58a
...@@ -635,7 +635,7 @@ asmlinkage long sys_shmctl (int shmid, int cmd, struct shmid_ds __user *buf) ...@@ -635,7 +635,7 @@ asmlinkage long sys_shmctl (int shmid, int cmd, struct shmid_ds __user *buf)
* "raddr" thing points to kernel space, and there has to be a wrapper around * "raddr" thing points to kernel space, and there has to be a wrapper around
* this. * this.
*/ */
long sys_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr) asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
{ {
struct shmid_kernel *shp; struct shmid_kernel *shp;
unsigned long addr; unsigned long addr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment