aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_alloc.h
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2010-02-12 16:17:25 +0100
committerBjörn Gustavsson <[email protected]>2010-03-10 14:25:40 +0100
commit37950725305fb8e911556608402cba6e4e17b87d (patch)
tree94ceada2198b3e7d823e5a45486fa00087a44296 /erts/emulator/beam/erl_alloc.h
parentac0b3f0a64705717d21e4a3d84d91d9c44f3baf7 (diff)
downloadotp-37950725305fb8e911556608402cba6e4e17b87d.tar.gz
otp-37950725305fb8e911556608402cba6e4e17b87d.tar.bz2
otp-37950725305fb8e911556608402cba6e4e17b87d.zip
Fix further test-suite problems
Fix safe_mul in the loader, which caused failures in the bit syntax test cases. Fix yet another Uint in erl_alloc.h (ERTS_CACHE_LINE_SIZE) causing segmentation fault when we have many schedulers (why only in that situation?). Clean up erl_mseg (remove old code for the Linux 32-bit mmap flag). While at it, also remove compilation warnings.
Diffstat (limited to 'erts/emulator/beam/erl_alloc.h')
-rw-r--r--erts/emulator/beam/erl_alloc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc.h b/erts/emulator/beam/erl_alloc.h
index 1080a24214..b7d6674a8a 100644
--- a/erts/emulator/beam/erl_alloc.h
+++ b/erts/emulator/beam/erl_alloc.h
@@ -238,7 +238,7 @@ void *erts_realloc_fnf(ErtsAlcType_t type, void *ptr, Uint size)
#ifndef ERTS_CACHE_LINE_SIZE
/* Assume a cache line size of 64 bytes */
-# define ERTS_CACHE_LINE_SIZE ((Uint) 64)
+# define ERTS_CACHE_LINE_SIZE ((UWord) 64)
# define ERTS_CACHE_LINE_MASK (ERTS_CACHE_LINE_SIZE - 1)
#endif