diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-05-18 12:36:57 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-05-18 12:36:57 -0400 |
| commit | 7610e014cb4cf5c6ff4d3c6eb513352120f4bfa9 (patch) | |
| tree | 14d8ff2961bd1271c0ac92ce456b7d90406686ed /include | |
| parent | fa8bcb9c9a625803de55d36cc14734273d628542 (diff) | |
| parent | bff066a411684d07e23307405f03cf7e7fc4afab (diff) | |
Merge tag 'v3.0.77' into v3.0-rt
This is the 3.0.77 stable release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ipc_namespace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h index a6d1655f9607..f1605b554fbb 100644 --- a/include/linux/ipc_namespace.h +++ b/include/linux/ipc_namespace.h @@ -42,8 +42,8 @@ struct ipc_namespace { size_t shm_ctlmax; size_t shm_ctlall; + unsigned long shm_tot; int shm_ctlmni; - int shm_tot; struct notifier_block ipcns_nb; |