Merge branch 'linus' into core/urgent

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

diff --git a/include/linux/shm.h b/include/linux/shm.h
index 7d27ffde01902a7a29687c5ef36b607d290c694d..92808b86703ba7a63f786407144ec28f10ad13bc 100644 (file)
--- a/include/linux/shm.h
+++ b/include/linux/shm.h
@@ -95,6 +95,9 @@ struct shmid_kernel /* private to the kernel */
        pid_t                   shm_cprid;
        pid_t                   shm_lprid;
        struct user_struct      *mlock_user;
+
+       /* The task created the shm object.  NULL if the task is dead. */
+       struct task_struct      *shm_creator;
 };
 
 /* shm_mode upper byte flags */