git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.28-rc7' into x86/cleanups
[pandora-kernel.git]
/
ipc
/
shm.c
diff --git
a/ipc/shm.c
b/ipc/shm.c
index
0add3fa
..
867e5d6
100644
(file)
--- a/
ipc/shm.c
+++ b/
ipc/shm.c
@@
-817,7
+817,7
@@
long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
struct ipc_namespace *ns;
struct shm_file_data *sfd;
struct path path;
- mode_t f_mode;
+
f
mode_t f_mode;
err = -EINVAL;
if (shmid < 0)