mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
remove CONFIG_UTS_NS and CONFIG_IPC_NS
CONFIG_UTS_NS and CONFIG_IPC_NS have very little value as they only deactivate the unshare of the uts and ipc namespaces and do not improve performance. Signed-off-by: Cedric Le Goater <[email protected]> Acked-by: "Serge E. Hallyn" <[email protected]> Cc: Eric W. Biederman <[email protected]> Cc: Herbert Poetzl <[email protected]> Cc: Pavel Emelianov <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
522ed7767e
commit
7d69a1f4a7
11 changed files with 12 additions and 79 deletions
|
|
@ -87,7 +87,7 @@ static int newque (struct ipc_namespace *ns, key_t key, int msgflg);
|
|||
static int sysvipc_msg_proc_show(struct seq_file *s, void *it);
|
||||
#endif
|
||||
|
||||
static void __ipc_init __msg_init_ns(struct ipc_namespace *ns, struct ipc_ids *ids)
|
||||
static void __msg_init_ns(struct ipc_namespace *ns, struct ipc_ids *ids)
|
||||
{
|
||||
ns->ids[IPC_MSG_IDS] = ids;
|
||||
ns->msg_ctlmax = MSGMAX;
|
||||
|
|
@ -96,7 +96,6 @@ static void __ipc_init __msg_init_ns(struct ipc_namespace *ns, struct ipc_ids *i
|
|||
ipc_init_ids(ids, ns->msg_ctlmni);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_IPC_NS
|
||||
int msg_init_ns(struct ipc_namespace *ns)
|
||||
{
|
||||
struct ipc_ids *ids;
|
||||
|
|
@ -128,7 +127,6 @@ void msg_exit_ns(struct ipc_namespace *ns)
|
|||
kfree(ns->ids[IPC_MSG_IDS]);
|
||||
ns->ids[IPC_MSG_IDS] = NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
void __init msg_init(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it);
|
|||
#define sc_semopm sem_ctls[2]
|
||||
#define sc_semmni sem_ctls[3]
|
||||
|
||||
static void __ipc_init __sem_init_ns(struct ipc_namespace *ns, struct ipc_ids *ids)
|
||||
static void __sem_init_ns(struct ipc_namespace *ns, struct ipc_ids *ids)
|
||||
{
|
||||
ns->ids[IPC_SEM_IDS] = ids;
|
||||
ns->sc_semmsl = SEMMSL;
|
||||
|
|
@ -132,7 +132,6 @@ static void __ipc_init __sem_init_ns(struct ipc_namespace *ns, struct ipc_ids *i
|
|||
ipc_init_ids(ids, ns->sc_semmni);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_IPC_NS
|
||||
int sem_init_ns(struct ipc_namespace *ns)
|
||||
{
|
||||
struct ipc_ids *ids;
|
||||
|
|
@ -164,7 +163,6 @@ void sem_exit_ns(struct ipc_namespace *ns)
|
|||
kfree(ns->ids[IPC_SEM_IDS]);
|
||||
ns->ids[IPC_SEM_IDS] = NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
void __init sem_init (void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
|
|||
static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
|
||||
#endif
|
||||
|
||||
static void __ipc_init __shm_init_ns(struct ipc_namespace *ns, struct ipc_ids *ids)
|
||||
static void __shm_init_ns(struct ipc_namespace *ns, struct ipc_ids *ids)
|
||||
{
|
||||
ns->ids[IPC_SHM_IDS] = ids;
|
||||
ns->shm_ctlmax = SHMMAX;
|
||||
|
|
@ -98,7 +98,6 @@ static void do_shm_rmid(struct ipc_namespace *ns, struct shmid_kernel *shp)
|
|||
shm_destroy(ns, shp);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_IPC_NS
|
||||
int shm_init_ns(struct ipc_namespace *ns)
|
||||
{
|
||||
struct ipc_ids *ids;
|
||||
|
|
@ -130,7 +129,6 @@ void shm_exit_ns(struct ipc_namespace *ns)
|
|||
kfree(ns->ids[IPC_SHM_IDS]);
|
||||
ns->ids[IPC_SHM_IDS] = NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
void __init shm_init (void)
|
||||
{
|
||||
|
|
|
|||
11
ipc/util.c
11
ipc/util.c
|
|
@ -50,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;
|
||||
|
|
@ -110,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
|
||||
|
|
@ -145,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;
|
||||
|
||||
|
|
|
|||
|
|
@ -41,12 +41,8 @@ struct ipc_ids {
|
|||
};
|
||||
|
||||
struct seq_file;
|
||||
#ifdef CONFIG_IPC_NS
|
||||
#define __ipc_init
|
||||
#else
|
||||
#define __ipc_init __init
|
||||
#endif
|
||||
void __ipc_init ipc_init_ids(struct ipc_ids *ids, int size);
|
||||
|
||||
void ipc_init_ids(struct ipc_ids *ids, int size);
|
||||
#ifdef CONFIG_PROC_FS
|
||||
void __init ipc_init_proc_interface(const char *path, const char *header,
|
||||
int ids, int (*show)(struct seq_file *, void *));
|
||||
|
|
|
|||
Loading…
Reference in a new issue