X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ipc%2Fshm.c;h=fe7ae73b698159cadb35290a13f187a6596c7c32;hb=19af5a8b2b3fcf2a65e3077deafe95706a1d4282;hp=4f133d24030f386aa5749455111ec1fbe4da33fe;hpb=a4cfae13cef6a700a04b13ba1d819c0641b1b26f;p=linux-2.6 diff --git a/ipc/shm.c b/ipc/shm.c index 4f133d2403..fe7ae73b69 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -698,7 +698,6 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr) int err; unsigned long flags; unsigned long prot; - unsigned long o_flags; int acc_mode; void *user_addr; @@ -725,11 +724,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr) if (shmflg & SHM_RDONLY) { prot = PROT_READ; - o_flags = O_RDONLY; acc_mode = S_IRUGO; } else { prot = PROT_READ | PROT_WRITE; - o_flags = O_RDWR; acc_mode = S_IRUGO | S_IWUGO; } if (shmflg & SHM_EXEC) {