|
@@ -698,7 +698,6 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
|
|
int err;
|
|
int err;
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
unsigned long prot;
|
|
unsigned long prot;
|
|
- unsigned long o_flags;
|
|
|
|
int acc_mode;
|
|
int acc_mode;
|
|
void *user_addr;
|
|
void *user_addr;
|
|
|
|
|
|
@@ -725,11 +724,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
|
|
|
|
|
|
if (shmflg & SHM_RDONLY) {
|
|
if (shmflg & SHM_RDONLY) {
|
|
prot = PROT_READ;
|
|
prot = PROT_READ;
|
|
- o_flags = O_RDONLY;
|
|
|
|
acc_mode = S_IRUGO;
|
|
acc_mode = S_IRUGO;
|
|
} else {
|
|
} else {
|
|
prot = PROT_READ | PROT_WRITE;
|
|
prot = PROT_READ | PROT_WRITE;
|
|
- o_flags = O_RDWR;
|
|
|
|
acc_mode = S_IRUGO | S_IWUGO;
|
|
acc_mode = S_IRUGO | S_IWUGO;
|
|
}
|
|
}
|
|
if (shmflg & SHM_EXEC) {
|
|
if (shmflg & SHM_EXEC) {
|