Commit 185606fc authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds
Browse files

[PATCH] remove unused o_flags from do_shmat 



Remove the unused variable o_flags from do_shmat.

Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 70af7c5c

ipc/shm.c

+0 −3
Original line number Diff line number Diff line
@@ -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) {