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
ipc, kernel: use Linux headers
[firefly-linux-kernel-4.4.55.git]
/
ipc
/
shm.c
diff --git
a/ipc/shm.c
b/ipc/shm.c
index 76459616a7fafe7581d713a245c63e861a4cf631..fe49fdd240a8831ba28011f0030924ef2370dfd0 100644
(file)
--- a/
ipc/shm.c
+++ b/
ipc/shm.c
@@
-43,7
+43,7
@@
#include <linux/mount.h>
#include <linux/ipc_namespace.h>
#include <linux/mount.h>
#include <linux/ipc_namespace.h>
-#include <
asm
/uaccess.h>
+#include <
linux
/uaccess.h>
#include "util.h"
#include "util.h"
@@
-609,15
+609,15
@@
static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
{
struct ipc_namespace *ns;
SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
{
struct ipc_namespace *ns;
- struct ipc_ops shm_ops;
+ static const struct ipc_ops shm_ops = {
+ .getnew = newseg,
+ .associate = shm_security,
+ .more_checks = shm_more_checks,
+ };
struct ipc_params shm_params;
ns = current->nsproxy->ipc_ns;
struct ipc_params shm_params;
ns = current->nsproxy->ipc_ns;
- shm_ops.getnew = newseg;
- shm_ops.associate = shm_security;
- shm_ops.more_checks = shm_more_checks;
-
shm_params.key = key;
shm_params.flg = shmflg;
shm_params.u.size = size;
shm_params.key = key;
shm_params.flg = shmflg;
shm_params.u.size = size;