Manual merge with Linus

[linux-2.6-omap-h63xx.git] / include / linux / sem.h

diff --git a/include/linux/sem.h b/include/linux/sem.h
index 2d8516be9fd7f71aac09b09076f2a04e2d37cc9f..106f9757339a54aeffc52a440129b5827040c8c1 100644 (file)
--- a/include/linux/sem.h
+++ b/include/linux/sem.h
@@ -88,6 +88,7 @@ struct sem {
 /* One sem_array data structure for each set of semaphores in the system. */
 struct sem_array {
        struct kern_ipc_perm    sem_perm;       /* permissions .. see ipc.h */
+       int                     sem_id;
        time_t                  sem_otime;      /* last semop time */
        time_t                  sem_ctime;      /* last change time */
        struct sem              *sem_base;      /* ptr to first semaphore in array */