2 files changed, 3 insertions, 9 deletions

diff --git a/src/lib/eina/eina_file.c b/src/lib/eina/eina_file.c
index 7b8aaff9e6..6d7ee56f54 100644
--- a/src/lib/eina/eina_file.c
+++ b/src/lib/eina/eina_file.c
@@ -37,7 +37,6 @@
 #include <fcntl.h>
 
 #define PATH_DELIM '/'
-#define COPY_BLOCKSIZE (4 * 1024 * 1024)
 
 #include "eina_config.h"
 #include "eina_private.h"
@@ -67,7 +66,7 @@
  * @cond LOCAL
  */
 
-#define EINA_SMALL_PAGE 4096
+#define EINA_SMALL_PAGE eina_cpu_page_size()
 #define EINA_HUGE_PAGE 16 * 1024 * 1024
 
 #ifdef HAVE_DIRENT_H
diff --git a/src/lib/eina/eina_mmap.c b/src/lib/eina/eina_mmap.c
index d8fd2e55f8..8b2853e443 100644
--- a/src/lib/eina/eina_mmap.c
+++ b/src/lib/eina/eina_mmap.c
@@ -147,12 +147,8 @@ eina_mmap_safety_enabled_set(Eina_Bool enabled)
         struct sigaction  sa;
 
         /* find out system page size the cleanest way we can */
-#ifdef _SC_PAGESIZE
-        _eina_mmap_pagesize = sysconf(_SC_PAGESIZE);
-        if (_eina_mmap_pagesize <= 0) return EINA_FALSE;
-#else
-        _eina_mmap_pagesize = 4096;
-#endif
+        _eina_mmap_pagesize = eina_cpu_page_size();
+
         /* no zero page device - open it */
         if (_eina_mmap_zero_fd < 0)
           {
@@ -169,7 +165,6 @@ eina_mmap_safety_enabled_set(Eina_Bool enabled)
              flags |= FD_CLOEXEC;
              fcntl(_eina_mmap_zero_fd, F_SETFD, flags);
 #endif
-             
           }
         /* set up signal handler for SIGBUS */
         sa.sa_sigaction = _eina_mmap_safe_sigbus;