summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-05-05 11:08:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-05 11:08:43 -0700
commite579dde654fc2c6b0d3e4b77a9a4b2d2405c510e (patch)
treefe507a2904fb302e964831a5ed079cb58ee44c37 /ipc
parentaf82455f7dbd9dc20244d80d033721b30d22c065 (diff)
parentd66bb1607e2d8d384e53f3d93db5c18483c8c4f7 (diff)
downloadlinux-e579dde654fc2c6b0d3e4b77a9a4b2d2405c510e.tar.gz
linux-e579dde654fc2c6b0d3e4b77a9a4b2d2405c510e.tar.bz2
linux-e579dde654fc2c6b0d3e4b77a9a4b2d2405c510e.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull namespace updates from Eric Biederman: "This is a set of small fixes that were mostly stumbled over during more significant development. This proc fix and the fix to posix-timers are the most significant of the lot. There is a lot of good development going on but unfortunately it didn't quite make the merge window" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: proc: Fix unbalanced hard link numbers signal: Make kill_proc_info static rlimit: Properly call security_task_setrlimit signal: Remove unused definition of sig_user_definied ia64: Remove unused IA64_TASK_SIGHAND_OFFSET and IA64_SIGHAND_SIGLOCK_OFFSET ipc: Remove unused declaration of recompute_msgmni posix-timers: Correct sanity check in posix_cpu_nsleep sysctl: Remove dead register_sysctl_root
Diffstat (limited to 'ipc')
-rw-r--r--ipc/util.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/ipc/util.h b/ipc/util.h
index 51f7ca58ac67..60ddccca464d 100644
--- a/ipc/util.h
+++ b/ipc/util.h
@@ -153,8 +153,6 @@ extern struct msg_msg *load_msg(const void __user *src, size_t len);
extern struct msg_msg *copy_msg(struct msg_msg *src, struct msg_msg *dst);
extern int store_msg(void __user *dest, struct msg_msg *msg, size_t len);
-extern void recompute_msgmni(struct ipc_namespace *);
-
static inline int ipc_buildid(int id, int seq)
{
return SEQ_MULTIPLIER * seq + id;