diff options
| author | Rickard Green <[email protected]> | 2013-11-25 09:06:53 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-11-25 09:06:53 +0100 |
| commit | f01eb9919311c6566d38c50625518d1b68aca73c (patch) | |
| tree | 8eacc64cdad1f73e3f7816095f90274f4fc7a217 /erts/configure.in | |
| parent | 85266798ccd3a55361aa2ffa5c587d4c3f8cc3ae (diff) | |
| parent | e6b3e1499677fa0aff83e0416ea9a58ffab95210 (diff) | |
| download | otp-f01eb9919311c6566d38c50625518d1b68aca73c.tar.gz otp-f01eb9919311c6566d38c50625518d1b68aca73c.tar.bz2 otp-f01eb9919311c6566d38c50625518d1b68aca73c.zip | |
Merge branch 'maint'
* maint:
Fix observer retrieval of alloc info
Fix documentation of the +MMsco switch
Replace the +MMscmgc switch with +MMscrfsd
Add switch for disabling sys_alloc carriers
Add support for locking mappings to physical memory
Diffstat (limited to 'erts/configure.in')
| -rw-r--r-- | erts/configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/configure.in b/erts/configure.in index 14eae10841..904544c85c 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -1988,7 +1988,7 @@ AC_CHECK_FUNCS([ieee_handler fpsetmask finite isnan isinf res_gethostbyname dlop gethrtime localtime_r gmtime_r inet_pton \ mmap mremap memcpy mallopt sbrk _sbrk __sbrk brk _brk __brk \ flockfile fstat strlcpy strlcat setsid posix2time time2posix \ - setlocale nl_langinfo poll]) + setlocale nl_langinfo poll mlockall]) case X$erl_xcomp_posix_memalign in |