diff --git a/drivers/staging/android/debug_kinfo.c b/drivers/staging/android/debug_kinfo.c
index 0a8d4deeb6dc..8e67fb3a205f 100644
--- a/drivers/staging/android/debug_kinfo.c
+++ b/drivers/staging/android/debug_kinfo.c
@@ -13,6 +13,7 @@
 #include <linux/of_address.h>
 #include <linux/of_reserved_mem.h>
 #include <linux/pgtable.h>
+#include <asm/module.h>
 #include "debug_kinfo.h"
 
 /*
@@ -163,7 +164,10 @@ static int debug_kinfo_probe(struct platform_device *pdev)
 	info->mod_core_layout_offset = offsetof(struct module, core_layout);
 	info->mod_init_layout_offset = offsetof(struct module, init_layout);
 	info->mod_kallsyms_offset = offsetof(struct module, kallsyms);
-#if defined(CONFIG_MODULES) && defined(MODULES_VADDR)
+#if defined(CONFIG_RANDOMIZE_BASE) && defined(MODULES_VSIZE)
+	info->module_start_va = module_alloc_base;
+	info->module_end_va = info->module_start_va + MODULES_VSIZE;
+#elif defined(CONFIG_MODULES) && defined(MODULES_VADDR)
 	info->module_start_va = MODULES_VADDR;
 	info->module_end_va = MODULES_END;
 #else