From f7000691fb0a4f649a73bdd146883788fd4cfd1b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 9 Apr 2009 08:45:24 +0000 Subject: Fix the ifdef logic broken by last commit for !defined (__mcoldfire__) --- ldso/include/dl-syscall.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h index 0b0b0ef1d..897923e53 100644 --- a/ldso/include/dl-syscall.h +++ b/ldso/include/dl-syscall.h @@ -152,9 +152,8 @@ static __always_inline _syscall2(int, _dl_gettimeofday, struct timeval *, tv, # 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 @@ static __always_inline void * _dl_mmap(void * addr, unsigned long size, int prot 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) -- cgit v1.2.3