projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'rpmsg-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg
[firefly-linux-kernel-4.4.55.git]
/
ipc
/
shm.c
diff --git
a/ipc/shm.c
b/ipc/shm.c
index cb858df061d37185cf96b7dadd6fe8d5d3e2b869..8247c49ec073c236d183ead9f51ab1f4b3779337 100644
(file)
--- a/
ipc/shm.c
+++ b/
ipc/shm.c
@@
-462,7
+462,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;