Add changes from the Linux-2.6 tree.

[linux-2.6.git] / include / linux / shm.h

diff --git a/include/linux/shm.h b/include/linux/shm.h
index 9a00f5f..a2c896a 100644 (file)
--- 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,12 +85,14 @@ 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 */
 #define        SHM_DEST        01000   /* segment will be destroyed on last detach */
 #define SHM_LOCKED      02000   /* segment will not be swapped */
 #define SHM_HUGETLB     04000   /* segment will use huge TLB pages */
+#define SHM_NORESERVE   010000  /* don't check for reservations */
 
 #ifdef CONFIG_SYSVIPC
 long do_shmat(int shmid, char __user *shmaddr, int shmflg, unsigned long *addr);