[IPV6]: Don't update ADVMSS on routes where the MTU is not also updated

[pandora-kernel.git] / ipc / util.c

diff --git a/ipc/util.c b/ipc/util.c
index 0ad5b1c..44e5135 100644 (file)
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -21,7 +21,6 @@
 #include <linux/shm.h>
 #include <linux/init.h>
 #include <linux/msg.h>
-#include <linux/smp_lock.h>
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
 #include <linux/capability.h>
@@ -51,7 +50,6 @@ struct ipc_namespace init_ipc_ns = {
        },
 };
 
-#ifdef CONFIG_IPC_NS
 static struct ipc_namespace *clone_ipc_ns(struct ipc_namespace *old_ns)
 {
        int err;
@@ -111,14 +109,6 @@ void free_ipc_ns(struct kref *kref)
        shm_exit_ns(ns);
        kfree(ns);
 }
-#else
-struct ipc_namespace *copy_ipcs(unsigned long flags, struct ipc_namespace *ns)
-{
-       if (flags & CLONE_NEWIPC)
-               return ERR_PTR(-EINVAL);
-       return ns;
-}
-#endif
 
 /**
  *     ipc_init        -       initialise IPC subsystem
@@ -146,7 +136,7 @@ __initcall(ipc_init);
  *     array itself. 
  */
  
-void __ipc_init ipc_init_ids(struct ipc_ids* ids, int size)
+void ipc_init_ids(struct ipc_ids* ids, int size)
 {
        int i;