diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-11-08 10:45:38 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-11-08 10:45:38 -0500 |
| commit | a6bc732b5a96b5403c2637e85c350b95ec6591f3 (patch) | |
| tree | 4b1c3967cd1de42a5e36e567cbdd18e1f4e8446f /include/linux/ipc_namespace.h | |
| parent | 9a22a8f558d09a83965d2bbe168294eb8ffb70e9 (diff) | |
| parent | dd212bd5bb8b15889821ef79213cdb5bd47c6f85 (diff) | |
Merge tag 'asoc-v3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.13
Some additional fixes for v3.13, the majority of which are removals and
downgrades of BUG()s from Takashi.
Diffstat (limited to 'include/linux/ipc_namespace.h')
| -rw-r--r-- | include/linux/ipc_namespace.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h index 19c19a5eee29..f6c82de12541 100644 --- a/include/linux/ipc_namespace.h +++ b/include/linux/ipc_namespace.h | |||
| @@ -34,9 +34,9 @@ struct ipc_namespace { | |||
| 34 | int sem_ctls[4]; | 34 | int sem_ctls[4]; |
| 35 | int used_sems; | 35 | int used_sems; |
| 36 | 36 | ||
| 37 | int msg_ctlmax; | 37 | unsigned int msg_ctlmax; |
| 38 | int msg_ctlmnb; | 38 | unsigned int msg_ctlmnb; |
| 39 | int msg_ctlmni; | 39 | unsigned int msg_ctlmni; |
| 40 | atomic_t msg_bytes; | 40 | atomic_t msg_bytes; |
| 41 | atomic_t msg_hdrs; | 41 | atomic_t msg_hdrs; |
| 42 | int auto_msgmni; | 42 | int auto_msgmni; |