diff options
| author | Artem B. Bityuckiy <dedekind@infradead.org> | 2005-07-06 10:43:18 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-06 13:40:38 -0400 |
| commit | b3539219c9ea20ebf6a5ea3cc534f423a3607c41 (patch) | |
| tree | d17c31c0eac0a7290ba5011b59a100fd9e9c9532 /include/asm-xtensa/ipc.h | |
| parent | 6430a8def12edebc1c9c7c2621d33ca0e8653c33 (diff) | |
| parent | a18bcb7450840f07a772a45229de4811d930f461 (diff) | |
Merge with rsync://fileserver/linux
Update to 2.6.12-rc3
Diffstat (limited to 'include/asm-xtensa/ipc.h')
| -rw-r--r-- | include/asm-xtensa/ipc.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/include/asm-xtensa/ipc.h b/include/asm-xtensa/ipc.h index d37bdb4d4c9c..a9eed4e21cb9 100644 --- a/include/asm-xtensa/ipc.h +++ b/include/asm-xtensa/ipc.h | |||
| @@ -11,24 +11,6 @@ | |||
| 11 | #ifndef _XTENSA_IPC_H | 11 | #ifndef _XTENSA_IPC_H |
| 12 | #define _XTENSA_IPC_H | 12 | #define _XTENSA_IPC_H |
| 13 | 13 | ||
| 14 | struct ipc_kludge { | 14 | #include <asm-generic/ipc.h> |
| 15 | struct msgbuf __user *msgp; | ||
| 16 | long msgtyp; | ||
| 17 | }; | ||
| 18 | |||
| 19 | #define SEMOP 1 | ||
| 20 | #define SEMGET 2 | ||
| 21 | #define SEMCTL 3 | ||
| 22 | #define SEMTIMEDOP 4 | ||
| 23 | #define MSGSND 11 | ||
| 24 | #define MSGRCV 12 | ||
| 25 | #define MSGGET 13 | ||
| 26 | #define MSGCTL 14 | ||
| 27 | #define SHMAT 21 | ||
| 28 | #define SHMDT 22 | ||
| 29 | #define SHMGET 23 | ||
| 30 | #define SHMCTL 24 | ||
| 31 | |||
| 32 | #define IPCCALL(version,op) ((version)<<16 | (op)) | ||
| 33 | 15 | ||
| 34 | #endif /* _XTENSA_IPC_H */ | 16 | #endif /* _XTENSA_IPC_H */ |