diff options
| -rw-r--r-- | init/Android.mk | 4 | ||||
| -rw-r--r-- | init/init.cpp | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/init/Android.mk b/init/Android.mk index 6cd47f476..325614e3a 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -30,6 +30,10 @@ endif init_options += -DLOG_UEVENTS=0 +ifeq ($(TARGET_USER_MODE_LINUX), true) + init_cflags += -DUSER_MODE_LINUX +endif + init_cflags += \ $(init_options) \ -Wall -Wextra \ diff --git a/init/init.cpp b/init/init.cpp index 1cfa70a23..0dfaf9e59 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -391,7 +391,10 @@ static int set_mmap_rnd_bits_action(const std::vector<std::string>& args) int ret = -1; /* values are arch-dependent */ -#if defined(__aarch64__) +#if defined(USER_MODE_LINUX) + /* uml does not support mmap_rnd_bits */ + ret = 0; +#elif defined(__aarch64__) /* arm64 supports 18 - 33 bits depending on pagesize and VA_SIZE */ if (set_mmap_rnd_bits_min(33, 24, false) && set_mmap_rnd_bits_min(16, 16, true)) { |