The patch titled
uml: MADV_REMOVE fixes
has been removed from the -mm tree. Its filename is
uml-madv_remove-fixes.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Jeff Dike <jdike@xxxxxxxxxxx>
MADV_REMOVE fixes - change the test mapping to be MAP_SHARED instead of
MAP_PRIVATE, as MADV_REMOVE on MAP_PRIVATE maps won't work. Also, use the
kernel's definition of MADV_REMOVE instead of hardcoding it if there isn't
a libc definition.
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>
Cc: Hugh Dickins <hugh@xxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/include/sysdep-i386/kernel-offsets.h | 2 ++
arch/um/include/sysdep-x86_64/kernel-offsets.h | 2 ++
arch/um/os-Linux/process.c | 4 ++--
3 files changed, 6 insertions(+), 2 deletions(-)
diff -puN arch/um/include/sysdep-i386/kernel-offsets.h~uml-madv_remove-fixes arch/um/include/sysdep-i386/kernel-offsets.h
--- devel/arch/um/include/sysdep-i386/kernel-offsets.h~uml-madv_remove-fixes 2006-04-18 22:19:57.000000000 -0700
+++ devel-akpm/arch/um/include/sysdep-i386/kernel-offsets.h 2006-04-18 22:19:57.000000000 -0700
@@ -1,6 +1,7 @@
#include <linux/stddef.h>
#include <linux/sched.h>
#include <linux/elf.h>
+#include <asm/mman.h>
#define DEFINE(sym, val) \
asm volatile("\n->" #sym " %0 " #val : : "i" (val))
@@ -16,6 +17,7 @@
void foo(void)
{
OFFSET(HOST_TASK_DEBUGREGS, task_struct, thread.arch.debugregs);
+ DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE);
#ifdef CONFIG_MODE_TT
OFFSET(HOST_TASK_EXTERN_PID, task_struct, thread.mode.tt.extern_pid);
#endif
diff -puN arch/um/include/sysdep-x86_64/kernel-offsets.h~uml-madv_remove-fixes arch/um/include/sysdep-x86_64/kernel-offsets.h
--- devel/arch/um/include/sysdep-x86_64/kernel-offsets.h~uml-madv_remove-fixes 2006-04-18 22:19:57.000000000 -0700
+++ devel-akpm/arch/um/include/sysdep-x86_64/kernel-offsets.h 2006-04-18 22:19:57.000000000 -0700
@@ -4,6 +4,7 @@
#include <linux/time.h>
#include <linux/elf.h>
#include <asm/page.h>
+#include <asm/mman.h>
#define DEFINE(sym, val) \
asm volatile("\n->" #sym " %0 " #val : : "i" (val))
@@ -18,6 +19,7 @@
void foo(void)
{
+ DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE);
#ifdef CONFIG_MODE_TT
OFFSET(HOST_TASK_EXTERN_PID, task_struct, thread.mode.tt.extern_pid);
#endif
diff -puN arch/um/os-Linux/process.c~uml-madv_remove-fixes arch/um/os-Linux/process.c
--- devel/arch/um/os-Linux/process.c~uml-madv_remove-fixes 2006-04-18 22:19:57.000000000 -0700
+++ devel-akpm/arch/um/os-Linux/process.c 2006-04-18 22:19:57.000000000 -0700
@@ -190,7 +190,7 @@ int os_unmap_memory(void *addr, int len)
}
#ifndef MADV_REMOVE
-#define MADV_REMOVE 0x5 /* remove these pages & resources */
+#define MADV_REMOVE KERNEL_MADV_REMOVE
#endif
int os_drop_memory(void *addr, int length)
@@ -216,7 +216,7 @@ int can_drop_memory(void)
}
addr = mmap64(NULL, UM_KERN_PAGE_SIZE, PROT_READ | PROT_WRITE,
- MAP_PRIVATE, fd, 0);
+ MAP_SHARED, fd, 0);
if(addr == MAP_FAILED){
printk("Mapping test memory file failed, err = %d\n", -errno);
return 0;
_
Patches currently in -mm which might be from jdike@xxxxxxxxxxx are
origin.patch
uml-prepare-fixing-compilation-output.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
