svn commit: [26039] branches/uClibc-nptl: ldso/include

[kraj at uclibc.org]

Author: kraj
Date: 2009-04-09 08:51:43 +0000 (Thu, 09 Apr 2009)
New Revision: 26039

Log:
Merged revisions 26038 via svnmerge from 
svn+ssh://svn.uclibc.org/svn/trunk/uClibc

........
  r26038 | kraj | 2009-04-09 01:45:24 -0700 (Thu, 09 Apr 2009) | 2 lines
  
  Fix the ifdef logic broken by last commit for !defined (__mcoldfire__)
........


Modified:
   branches/uClibc-nptl/
   branches/uClibc-nptl/ldso/include/dl-syscall.h


Changeset:

Property changes on: branches/uClibc-nptl
___________________________________________________________________
Modified: svnmerge-integrated
   - /trunk/uClibc:1-26033
   + /trunk/uClibc:1-26038

Modified: branches/uClibc-nptl/ldso/include/dl-syscall.h
===================================================================
--- branches/uClibc-nptl/ldso/include/dl-syscall.h	2009-04-09 08:45:24 UTC (rev 26038)
+++ branches/uClibc-nptl/ldso/include/dl-syscall.h	2009-04-09 08:51:43 UTC (rev 26039)
@@ -152,9 +152,8 @@
 # define __NR__dl_mmap __NR_mmap
 static __always_inline _syscall6(void *, _dl_mmap, void *, start, size_t, length,
                         int, prot, int, flags, int, fd, off_t, offset);
-#if !defined (__mcoldfire__) // Might be a kernel problem. failed on 2.6.25
 /* then try mmap2() */
-#elif defined(__NR_mmap2)
+#elif defined(__NR_mmap2) && !defined (__mcoldfire__)
 
 # define __NR___syscall_mmap2       __NR_mmap2
 static __always_inline _syscall6(__ptr_t, __syscall_mmap2, __ptr_t, addr, size_t, len,
@@ -176,7 +175,6 @@
 	return __syscall_mmap2(addr, size, prot, flags,
 	                       fd, (off_t) (offset >> MMAP2_PAGE_SHIFT));
 }
-#endif
 /* finally, fall back to mmap(), syscall1() style */
 #elif defined(__NR_mmap)