The patch titled
uml: clean up after MADVISE_REMOVE
has been removed from the -mm tree. Its filename is
uml-clean-up-after-madvise_remove.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>
The MADVISE_REMOVE-checking code didn't clean up after itself.
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/os-Linux/process.c | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff -puN arch/um/os-Linux/process.c~uml-clean-up-after-madvise_remove arch/um/os-Linux/process.c
--- devel/arch/um/os-Linux/process.c~uml-clean-up-after-madvise_remove 2006-05-01 12:15:30.000000000 -0700
+++ devel-akpm/arch/um/os-Linux/process.c 2006-05-01 12:15:30.000000000 -0700
@@ -206,29 +206,36 @@ int os_drop_memory(void *addr, int lengt
int can_drop_memory(void)
{
void *addr;
- int fd;
+ int fd, ok = 0;
printk("Checking host MADV_REMOVE support...");
fd = create_mem_file(UM_KERN_PAGE_SIZE);
if(fd < 0){
printk("Creating test memory file failed, err = %d\n", -fd);
- return 0;
+ goto out;
}
addr = mmap64(NULL, UM_KERN_PAGE_SIZE, PROT_READ | PROT_WRITE,
MAP_SHARED, fd, 0);
if(addr == MAP_FAILED){
printk("Mapping test memory file failed, err = %d\n", -errno);
- return 0;
+ goto out_close;
}
if(madvise(addr, UM_KERN_PAGE_SIZE, MADV_REMOVE) != 0){
printk("MADV_REMOVE failed, err = %d\n", -errno);
- return 0;
+ goto out_unmap;
}
printk("OK\n");
- return 1;
+ ok = 1;
+
+out_unmap:
+ munmap(addr, UM_KERN_PAGE_SIZE);
+out_close:
+ close(fd);
+out:
+ return ok;
}
void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int))
_
Patches currently in -mm which might be from jdike@xxxxxxxxxxx are
origin.patch
uml-change-timer-initialization.patch
uml-make-copy__user-atomic.patch
uml-fix-not_dead_yet-when-directory-is-in-bad-state.patch
uml-rename-and-improve-actually_do_remove.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
