Merge pull request torvalds#227 from hkchu/work

Add a couple of debugging tweaks
laijs · Sep 14, 2016 · cdd1730 · cdd1730
2 parents e496a1f + 85d8d5c
commit cdd1730
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/arch/lkl/mm/bootmem.c b/arch/lkl/mm/bootmem.c
@@ -21,7 +21,8 @@ void __init bootmem_init(int mem_size)
 		memory_start = PAGE_ALIGN(memory_start);
 		mem_size = (mem_size / PAGE_SIZE) * PAGE_SIZE;
 	}
-
+	pr_info("bootmem address range: 0x%lx - 0x%lx\n", memory_start,
+		memory_start+mem_size);
 	/*
 	 * Give all the memory to the bootmap allocator, tell it to put the
 	 * boot mem_map at the start of memory.

diff --git a/tools/lkl/lib/hijack/init.c b/tools/lkl/lib/hijack/init.c
@@ -229,6 +229,15 @@ hijack_init(void)
 	if (offload1)
 		offload = strtol(offload1, NULL, 0);
 
+	if (lkl_debug & 0x200) {
+		char c;
+
+		printf("press 'enter' to continue\n");
+		if (scanf("%c", &c) <= 0) {
+			fprintf(stderr, "scanf() fails\n");
+			return;
+		}
+	}
 	if (single_cpu) {
 		single_cpu_mode = atoi(single_cpu);
 		switch (single_cpu_mode) {