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 1.9.5.x5
[linux-2.6.git]
/
fs
/
binfmt_flat.c
diff --git
a/fs/binfmt_flat.c
b/fs/binfmt_flat.c
index
c8113cc
..
86329f1
100644
(file)
--- a/
fs/binfmt_flat.c
+++ b/
fs/binfmt_flat.c
@@
-36,11
+36,11
@@
#include <linux/personality.h>
#include <linux/init.h>
#include <linux/flat.h>
#include <linux/personality.h>
#include <linux/init.h>
#include <linux/flat.h>
+#include <linux/vs_memory.h>
#include <asm/byteorder.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/byteorder.h>
#include <asm/system.h>
#include <asm/uaccess.h>
-#include <asm/pgalloc.h>
#include <asm/unaligned.h>
#include <asm/cacheflush.h>
#include <asm/unaligned.h>
#include <asm/cacheflush.h>
@@
-487,7
+487,7
@@
static int load_flat_file(struct linux_binprm * bprm,
* size limits imposed on them by creating programs with large
* arrays in the data or bss.
*/
* size limits imposed on them by creating programs with large
* arrays in the data or bss.
*/
- rlim = current->rlim[RLIMIT_DATA].rlim_cur;
+ rlim = current->
signal->
rlim[RLIMIT_DATA].rlim_cur;
if (rlim >= RLIM_INFINITY)
rlim = ~0;
if (data_len + bss_len > rlim)
if (rlim >= RLIM_INFINITY)
rlim = ~0;
if (data_len + bss_len > rlim)
@@
-724,7
+724,7
@@
static int load_flat_file(struct linux_binprm * bprm,
return -ENOEXEC;
/* Get the pointer's value. */
return -ENOEXEC;
/* Get the pointer's value. */
- addr = flat_get_addr_from_rp(rp, relval);
+ addr = flat_get_addr_from_rp(rp, relval
, flags
);
if (addr != 0) {
/*
* Do the relocation. PIC relocs in the data section are
if (addr != 0) {
/*
* Do the relocation. PIC relocs in the data section are
@@
-897,7
+897,7
@@
static void __exit exit_flat_binfmt(void)
/****************************************************************************/
/****************************************************************************/
-
module_init
(init_flat_binfmt);
+
core_initcall
(init_flat_binfmt);
module_exit(exit_flat_binfmt);
/****************************************************************************/
module_exit(exit_flat_binfmt);
/****************************************************************************/