diff options
author | 2016-04-18 11:18:55 +0200 | |
---|---|---|
committer | 2016-04-18 11:18:55 +0200 | |
commit | 9938b04472d5c59f8bd8152a548533a8599596a2 (patch) | |
tree | 0fc8318100878c5e446076613ec02a97aa179119 /ipc/util.h | |
parent | Doc: treewide : Fix typos in DocBook/filesystem.xml (diff) | |
parent | Linux 4.6-rc4 (diff) | |
download | linux-9938b04472d5c59f8bd8152a548533a8599596a2.tar.gz linux-9938b04472d5c59f8bd8152a548533a8599596a2.tar.bz2 linux-9938b04472d5c59f8bd8152a548533a8599596a2.zip |
Merge branch 'master' into for-next
Sync with Linus' tree so that patches against newer codebase can be applied.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'ipc/util.h')
-rw-r--r-- | ipc/util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/util.h b/ipc/util.h index 3a8a5a0eca62..51f7ca58ac67 100644 --- a/ipc/util.h +++ b/ipc/util.h @@ -118,7 +118,7 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flg); * both function can sleep */ void *ipc_alloc(int size); -void ipc_free(void *ptr, int size); +void ipc_free(void *ptr); /* * For allocation that need to be freed by RCU. |