git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove CONFIG_UTS_NS and CONFIG_IPC_NS
[safe/jmp/linux-2.6]
/
ipc
/
shm.c
diff --git
a/ipc/shm.c
b/ipc/shm.c
index
047b823
..
242c3f6
100644
(file)
--- a/
ipc/shm.c
+++ b/
ipc/shm.c
@@
-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 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;
{
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);
}
shm_destroy(ns, shp);
}
-#ifdef CONFIG_IPC_NS
int shm_init_ns(struct ipc_namespace *ns)
{
struct ipc_ids *ids;
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;
}
kfree(ns->ids[IPC_SHM_IDS]);
ns->ids[IPC_SHM_IDS] = NULL;
}
-#endif
void __init shm_init (void)
{
void __init shm_init (void)
{
@@
-366,9
+364,10
@@
static int newseg (struct ipc_namespace *ns, key_t key, int shmflg, size_t size)
return error;
}
return error;
}
+ sprintf (name, "SYSV%08x", key);
if (shmflg & SHM_HUGETLB) {
if (shmflg & SHM_HUGETLB) {
- /* hugetlb_
zero
_setup takes care of mlock user accounting */
- file = hugetlb_
zero_setup(
size);
+ /* hugetlb_
file
_setup takes care of mlock user accounting */
+ file = hugetlb_
file_setup(name,
size);
shp->mlock_user = current->user;
} else {
int acctflag = VM_ACCOUNT;
shp->mlock_user = current->user;
} else {
int acctflag = VM_ACCOUNT;
@@
-379,7
+378,6
@@
static int newseg (struct ipc_namespace *ns, key_t key, int shmflg, size_t size)
if ((shmflg & SHM_NORESERVE) &&
sysctl_overcommit_memory != OVERCOMMIT_NEVER)
acctflag = 0;
if ((shmflg & SHM_NORESERVE) &&
sysctl_overcommit_memory != OVERCOMMIT_NEVER)
acctflag = 0;
- sprintf (name, "SYSV%08x", key);
file = shmem_file_setup(name, size, acctflag);
}
error = PTR_ERR(file);
file = shmem_file_setup(name, size, acctflag);
}
error = PTR_ERR(file);