diff options
Diffstat (limited to 'ipc/util.h')
-rw-r--r-- | ipc/util.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ipc/util.h b/ipc/util.h index 9746886757de..8c834ed39012 100644 --- a/ipc/util.h +++ b/ipc/util.h | |||
@@ -34,13 +34,13 @@ | |||
34 | extern int ipc_mni; | 34 | extern int ipc_mni; |
35 | extern int ipc_mni_shift; | 35 | extern int ipc_mni_shift; |
36 | 36 | ||
37 | #define IPCMNI_SEQ_SHIFT ipc_mni_shift | 37 | #define ipcmni_seq_shift() ipc_mni_shift |
38 | #define IPCMNI_IDX_MASK ((1 << ipc_mni_shift) - 1) | 38 | #define IPCMNI_IDX_MASK ((1 << ipc_mni_shift) - 1) |
39 | 39 | ||
40 | #else /* CONFIG_SYSVIPC_SYSCTL */ | 40 | #else /* CONFIG_SYSVIPC_SYSCTL */ |
41 | 41 | ||
42 | #define ipc_mni IPCMNI | 42 | #define ipc_mni IPCMNI |
43 | #define IPCMNI_SEQ_SHIFT IPCMNI_SHIFT | 43 | #define ipcmni_seq_shift() IPCMNI_SHIFT |
44 | #define IPCMNI_IDX_MASK ((1 << IPCMNI_SHIFT) - 1) | 44 | #define IPCMNI_IDX_MASK ((1 << IPCMNI_SHIFT) - 1) |
45 | #endif /* CONFIG_SYSVIPC_SYSCTL */ | 45 | #endif /* CONFIG_SYSVIPC_SYSCTL */ |
46 | 46 | ||
@@ -123,8 +123,8 @@ struct pid_namespace *ipc_seq_pid_ns(struct seq_file *); | |||
123 | #define IPC_SHM_IDS 2 | 123 | #define IPC_SHM_IDS 2 |
124 | 124 | ||
125 | #define ipcid_to_idx(id) ((id) & IPCMNI_IDX_MASK) | 125 | #define ipcid_to_idx(id) ((id) & IPCMNI_IDX_MASK) |
126 | #define ipcid_to_seqx(id) ((id) >> IPCMNI_SEQ_SHIFT) | 126 | #define ipcid_to_seqx(id) ((id) >> ipcmni_seq_shift()) |
127 | #define IPCID_SEQ_MAX (INT_MAX >> IPCMNI_SEQ_SHIFT) | 127 | #define ipcid_seq_max() (INT_MAX >> ipcmni_seq_shift()) |
128 | 128 | ||
129 | /* must be called with ids->rwsem acquired for writing */ | 129 | /* must be called with ids->rwsem acquired for writing */ |
130 | int ipc_addid(struct ipc_ids *, struct kern_ipc_perm *, int); | 130 | int ipc_addid(struct ipc_ids *, struct kern_ipc_perm *, int); |