[SSI] openssi/kernel/arch/x86_64/kernel sys_x86_64.c,1.2,1.3

John Hughes <[email protected]> Mon, 26 Apr 2010 18:56:03 +0000
Newsgroups gmane.linux.cluster.ssic.cvs
Message-ID <[email protected]>
Update of /cvsroot/ssic-linux/openssi/kernel/arch/x86_64/kernel
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv6309

Modified Files:
      Tag: 1
	sys_x86_64.c 
Log Message:
Forgot #ifdef

Index: sys_x86_64.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/arch/x86_64/kernel/sys_x86_64.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sys_x86_64.c	26 Apr 2010 18:52:36 -0000	1.2
+++ sys_x86_64.c	26 Apr 2010 18:56:01 -0000	1.3
@@ -108,7 +108,11 @@
 	if (len > end)
 		return -ENOMEM;
 
+#ifdef CONFIG_SSI
 	if (addr || (flags & MAP_MIGRATE)) {
+#else
+	if (addr) {
+#endif
 		addr = PAGE_ALIGN(addr);
 		vma = find_vma(mm, addr);
 		if (end - len >= addr &&


------------------------------------------------------------------------------