Author: trasz
Date: Tue Jan 21 20:32:49 2020
New Revision: 356950
URL: https://svnweb.freebsd.org/changeset/base/356950

Log:
  Revert r356948; breaks build somehow.

Modified:
  head/sys/compat/linux/linux_mmap.c
  head/sys/compat/linux/linux_mmap.h

Modified: head/sys/compat/linux/linux_mmap.c
==============================================================================
--- head/sys/compat/linux/linux_mmap.c  Tue Jan 21 20:21:52 2020        
(r356949)
+++ head/sys/compat/linux/linux_mmap.c  Tue Jan 21 20:32:49 2020        
(r356950)
@@ -114,13 +114,6 @@ linux_mmap_common(struct thread *td, uintptr_t addr, s
                bsd_flags |= MAP_STACK;
 
        /*
-        * According to the Linux mmap(2) man page, "MAP_32BIT flag
-        * is ignored when MAP_FIXED is set."
-        */
-       if ((flags & LINUX_MAP_32BIT) && (flags & LINUX_MAP_FIXED) == 0)
-               bsd_flags |= MAP_32BIT;
-
-       /*
         * PROT_READ, PROT_WRITE, or PROT_EXEC implies PROT_READ and PROT_EXEC
         * on Linux/i386 if the binary requires executable stack.
         * We do this only for IA32 emulation as on native i386 this is does not

Modified: head/sys/compat/linux/linux_mmap.h
==============================================================================
--- head/sys/compat/linux/linux_mmap.h  Tue Jan 21 20:21:52 2020        
(r356949)
+++ head/sys/compat/linux/linux_mmap.h  Tue Jan 21 20:32:49 2020        
(r356950)
@@ -39,7 +39,6 @@
 #define        LINUX_MAP_PRIVATE       0x0002
 #define        LINUX_MAP_FIXED         0x0010
 #define        LINUX_MAP_ANON          0x0020
-#define        LINUX_MAP_32BIT         0x0040
 #define        LINUX_MAP_GROWSDOWN     0x0100
 
 #define        LINUX_PROT_GROWSDOWN    0x01000000
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to