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 /ipc | |
| 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 'ipc')
| -rw-r--r-- | ipc/shm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/shm.c b/ipc/shm.c index ab3385a21b27..10e17a7ccada 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -343,7 +343,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) size_t size = params->u.size; int error; struct shmid_kernel *shp; - int numpages = (size + PAGE_SIZE -1) >> PAGE_SHIFT; + size_t numpages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT; struct file * file; char name[13]; int id; |