aboutsummaryrefslogtreecommitdiff
path: root/ipc
diff options
context:
space:
mode:
authorHugh Dickins <hugh@veritas.com>2006-06-23 02:03:45 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 07:42:51 -0700
commit185606fc6a120dbebffa6d06a559c20ec2b20034 (patch)
tree6702725dd3da6371d0816dceb1a358a67ae32a99 /ipc
parent70af7c5c6492ef6ad137dbff6c4568c73edbcaf0 (diff)
downloadlinux-linaro-stable-185606fc6a120dbebffa6d06a559c20ec2b20034.tar.gz
[PATCH] remove unused o_flags from do_shmat
Remove the unused variable o_flags from do_shmat. Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/shm.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index 4f133d24030f..fe7ae73b6981 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) {