X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fshm.h;h=80113a1f60bc83447184c6cc55b89eafa7eebd10;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=9a00f5ff6c581b1ba56e52da069500f183df4198;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/include/linux/shm.h b/include/linux/shm.h
index 9a00f5ff6..80113a1f6 100644
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
@@ -44,6 +44,7 @@ struct shmid_ds {
 #define	SHM_RDONLY	010000	/* read-only access */
 #define	SHM_RND		020000	/* round attach address to SHMLBA boundary */
 #define	SHM_REMAP	040000	/* take-over region on attach */
+#define	SHM_EXEC	0100000	/* execution access */
 
 /* super user shmctl commands */
 #define SHM_LOCK 	11
@@ -84,6 +85,7 @@ struct shmid_kernel /* private to the kernel */
 	time_t			shm_ctim;
 	pid_t			shm_cprid;
 	pid_t			shm_lprid;
+	struct user_struct	*mlock_user;
 };
 
 /* shm_mode upper byte flags */