Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 28939
b: refs/heads/master
c: 185606f
h: refs/heads/master
i:
  28937: 12be2a6
  28935: 98ba754
v: v3
  • Loading branch information
Hugh Dickins authored and Linus Torvalds committed Jun 23, 2006
1 parent d59b76c commit 20b1fba
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 70af7c5c6492ef6ad137dbff6c4568c73edbcaf0
refs/heads/master: 185606fc6a120dbebffa6d06a559c20ec2b20034
3 changes: 0 additions & 3 deletions trunk/ipc/shm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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) {
Expand Down

0 comments on commit 20b1fba

Please sign in to comment.