git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0-rc4
[linux-2.6.git]
/
fs
/
binfmt_som.c
diff --git
a/fs/binfmt_som.c
b/fs/binfmt_som.c
index
ac64fa5
..
558105a
100644
(file)
--- a/
fs/binfmt_som.c
+++ b/
fs/binfmt_som.c
@@
-28,6
+28,7
@@
#include <linux/shm.h>
#include <linux/personality.h>
#include <linux/init.h>
#include <linux/shm.h>
#include <linux/personality.h>
#include <linux/init.h>
+#include <linux/vs_memory.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
#include <asm/uaccess.h>
#include <asm/pgtable.h>
@@
-254,12
+255,11
@@
load_som_binary(struct linux_binprm * bprm, struct pt_regs * regs)
set_binfmt(&som_format);
compute_creds(bprm);
set_binfmt(&som_format);
compute_creds(bprm);
- setup_arg_pages(bprm, EXSTACK_DEFAULT);
+ setup_arg_pages(bprm,
STACK_TOP,
EXSTACK_DEFAULT);
create_som_tables(bprm);
current->mm->start_stack = bprm->p;
create_som_tables(bprm);
current->mm->start_stack = bprm->p;
- // current->mm->rss = 0;
vx_rsspages_sub(current->mm, current->mm->rss);
#if 0
vx_rsspages_sub(current->mm, current->mm->rss);
#if 0
@@
-306,5
+306,5
@@
static void __exit exit_som_binfmt(void)
unregister_binfmt(&som_format);
}
unregister_binfmt(&som_format);
}
-
module_init
(init_som_binfmt);
+
core_initcall
(init_som_binfmt);
module_exit(exit_som_binfmt);
module_exit(exit_som_binfmt);