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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
x86_64
/
ia32
/
syscall32-xen.c
diff --git
a/arch/x86_64/ia32/syscall32-xen.c
b/arch/x86_64/ia32/syscall32-xen.c
index
e99a6f7
..
9c416f0
100644
(file)
--- a/
arch/x86_64/ia32/syscall32-xen.c
+++ b/
arch/x86_64/ia32/syscall32-xen.c
@@
-10,6
+10,7
@@
#include <linux/init.h>
#include <linux/stringify.h>
#include <linux/security.h>
#include <linux/init.h>
#include <linux/stringify.h>
#include <linux/security.h>
+#include <linux/vs_memory.h>
#include <asm/proto.h>
#include <asm/tlbflush.h>
#include <asm/ia32_unistd.h>
#include <asm/proto.h>
#include <asm/tlbflush.h>
#include <asm/ia32_unistd.h>
@@
-47,7
+48,9
@@
static struct vm_operations_struct syscall32_vm_ops = {
struct linux_binprm;
/* Setup a VMA at program startup for the vsyscall page */
struct linux_binprm;
/* Setup a VMA at program startup for the vsyscall page */
-int syscall32_setup_pages(struct linux_binprm *bprm, int exstack)
+int syscall32_setup_pages(struct linux_binprm *bprm, int exstack,
+ unsigned long start_code,
+ unsigned long interp_map_address)
{
int npages = (VSYSCALL32_END - VSYSCALL32_BASE) >> PAGE_SHIFT;
struct vm_area_struct *vma;
{
int npages = (VSYSCALL32_END - VSYSCALL32_BASE) >> PAGE_SHIFT;
struct vm_area_struct *vma;
@@
-75,7
+78,7
@@
int syscall32_setup_pages(struct linux_binprm *bprm, int exstack)
kmem_cache_free(vm_area_cachep, vma);
return ret;
}
kmem_cache_free(vm_area_cachep, vma);
return ret;
}
-
mm->total_vm += npages
;
+
vx_vmpages_add(mm, npages)
;
up_write(&mm->mmap_sem);
return 0;
}
up_write(&mm->mmap_sem);
return 0;
}