Fixed setup_one_range to check kmalloc_ok before allocating memory.

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index d24e914..d646b57 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -229,7 +229,9 @@ static int setup_one_range(int fd, char *driver, unsigned long start,
 		fd = create_mem_file(len);
 
 	if(region == NULL){
-		region = alloc_bootmem_low_pages(sizeof(*region));
+		if(kmalloc_ok)
+			region = kmalloc(sizeof(*region), GFP_KERNEL);
+		else region = alloc_bootmem_low_pages(sizeof(*region));
 		if(region == NULL)
 			panic("Failed to allocating mem_region");
 	}