[PATCH] memory hotplug for ia64 (linux-2.6.7) [2/2]

[PATCH] memory hotplug for ia64 (linux-2.6.7) [2/2]

[Fumihiro Tersawa]

This is a patch of memory hotplug for ia64.


diff -dupr linux-2.6.7-ORG/arch/ia64/ia32/sys_ia32.c linux-2.6.7-remap-ia64-aio/arch/ia64/ia32/sys_ia32.c
--- linux-2.6.7-ORG/arch/ia64/ia32/sys_ia32.c	2004-07-13 10:40:39.000000000 +0900
+++ linux-2.6.7-remap-ia64-aio/arch/ia64/ia32/sys_ia32.c	2004-07-14 11:31:29.234716800 +0900
@@ -440,7 +440,7 @@ sys32_mmap (struct mmap_arg_struct *arg)
 			return -EBADF;
 	}
 
-	addr = ia32_do_mmap(file, a.addr, a.len, a.prot, flags, a.offset);
+	addr = ia32_do_mmap(file, a.addr, a.len, a.prot, flags & ~MAP_IMMOVABLE, a.offset);
 
 	if (file)
 		fput(file);
@@ -461,7 +461,7 @@ sys32_mmap2 (unsigned int addr, unsigned
 			return -EBADF;
 	}
 
-	retval = ia32_do_mmap(file, addr, len, prot, flags,
+	retval = ia32_do_mmap(file, addr, len, prot, flags & ~MAP_IMMOVABLE,
 			      (unsigned long) pgoff << IA32_PAGE_SHIFT);
 
 	if (file)
diff -dupr linux-2.6.7-ORG/arch/ia64/kernel/sys_ia64.c linux-2.6.7-remap-ia64-aio/arch/ia64/kernel/sys_ia64.c
--- linux-2.6.7-ORG/arch/ia64/kernel/sys_ia64.c	2004-07-13 10:40:39.000000000 +0900
+++ linux-2.6.7-remap-ia64-aio/arch/ia64/kernel/sys_ia64.c	2004-07-14 11:31:29.235693362 +0900
@@ -239,7 +239,7 @@ out:	if (file)
 asmlinkage unsigned long
 sys_mmap2 (unsigned long addr, unsigned long len, int prot, int flags, int fd, long pgoff)
 {
-	addr = do_mmap2(addr, len, prot, flags, fd, pgoff);
+	addr = do_mmap2(addr, len, prot, flags & ~MAP_IMMOVABLE, fd, pgoff);
 	if (!IS_ERR((void *) addr))
 		force_successful_syscall_return();
 	return addr;
@@ -251,7 +251,7 @@ sys_mmap (unsigned long addr, unsigned l
 	if (offset_in_page(off) != 0)
 		return -EINVAL;
 
-	addr = do_mmap2(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
+	addr = do_mmap2(addr, len, prot, flags & ~MAP_IMMOVABLE, fd, off >> PAGE_SHIFT);
 	if (!IS_ERR((void *) addr))
 		force_successful_syscall_return();
 	return addr;