Merge with git+ssh://hera.kernel.org/pub/scm/libs/klibc/klibc.git
diff --git a/include/klibc/sysconfig.h b/include/klibc/sysconfig.h
index c354b7c..1a9cdea 100644
--- a/include/klibc/sysconfig.h
+++ b/include/klibc/sysconfig.h
@@ -25,9 +25,13 @@
* has no mmap(), munmap(), mremap(), msync(), mprotect(), or any
* of the mlock family.
*/
-/* Default to having an MMU */
+/* Default to having an MMU if we can find any mmap system call */
#ifndef _KLIBC_NO_MMU
-# define _KLIBC_NO_MMU 0
+# if defined(__NR_mmap) || defined(__NR_mmap2)
+# define _KLIBC_NO_MMU 0
+# else
+# define _KLIBC_NO_MMU 1
+# endif
#endif
@@ -54,7 +58,7 @@
* On most architectures, this is always 12, but on some
* architectures it can be a different number, or the current
* page size. If this is dependent on the page size, define
- * this to an expression which includes __getpagesize().
+ * this to an expression which includes __getpageshift().
*/
#ifndef _KLIBC_MMAP2_SHIFT
# define _KLIBC_MMAP2_SHIFT 12
diff --git a/version b/version
index d0149fe..80e78df 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.3.4
+1.3.5
