Matt Helsley wrote: > On Tue, Mar 31, 2009 at 01:32:31AM -0400, Oren Laadan wrote: >> Signed-off-by: Oren Laadan <or...@cs.columbia.edu> > > The description is empty and this patch is rather pointless without 7/7. > Any reason you kept it separate from 7/7? At the very least this patch > needs a brief description.
Yup, forgot the description. Will add. I try to isolate changes to existing kernel files into separate patches than the new c/r code. I think it will be helpful to be able to point out those changes upon request. Oren. > > Cheers, > -Matt Helsley > >> --- >> include/linux/shm.h | 4 ++++ >> ipc/shm.c | 4 ++-- >> 2 files changed, 6 insertions(+), 2 deletions(-) >> >> diff --git a/include/linux/shm.h b/include/linux/shm.h >> index eca6235..ec36e99 100644 >> --- a/include/linux/shm.h >> +++ b/include/linux/shm.h >> @@ -118,6 +118,10 @@ static inline int is_file_shm_hugepages(struct file >> *file) >> } >> #endif >> >> +struct ipc_namespace; >> +extern int shmctl_down(struct ipc_namespace *ns, int shmid, int cmd, >> + struct shmid_ds __user *buf, int version); >> + >> #endif /* __KERNEL__ */ >> >> #endif /* _LINUX_SHM_H_ */ >> diff --git a/ipc/shm.c b/ipc/shm.c >> index 5ac6aec..28a8b57 100644 >> --- a/ipc/shm.c >> +++ b/ipc/shm.c >> @@ -605,8 +605,8 @@ static void shm_get_stat(struct ipc_namespace *ns, >> unsigned long *rss, >> * to be held in write mode. >> * NOTE: no locks must be held, the rw_mutex is taken inside this function. >> */ >> -static int shmctl_down(struct ipc_namespace *ns, int shmid, int cmd, >> - struct shmid_ds __user *buf, int version) >> +int shmctl_down(struct ipc_namespace *ns, int shmid, int cmd, >> + struct shmid_ds __user *buf, int version) >> { >> struct kern_ipc_perm *ipcp; >> struct shmid64_ds shmid64; >> -- >> 1.5.4.3 >> >> _______________________________________________ >> Containers mailing list >> contain...@lists.linux-foundation.org >> https://lists.linux-foundation.org/mailman/listinfo/containers > _______________________________________________ Containers mailing list contain...@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers _______________________________________________ Devel mailing list Devel@openvz.org https://openvz.org/mailman/listinfo/devel