mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Fumihiro Tersawa <terasawa@pst.fujitsu.com>
To: linux-kernel <linux-kernel@vger.kernel.org>,
	lhms-devel <lhms-devel@lists.sourceforge.net>
Subject: [PATCH] memory hotplug for ia64 (linux-2.6.7) [2/2]
Date: Tue, 20 Jul 2004 18:25:27 +0900	[thread overview]
Message-ID: <20040720182204.12BA.TERASAWA@pst.fujitsu.com> (raw)

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;


                 reply	other threads:[~2004-07-20  9:25 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20040720182204.12BA.TERASAWA@pst.fujitsu.com \
    --to=terasawa@pst.fujitsu.com \
    --cc=lhms-devel@lists.sourceforge.net \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome