update test patch

2 files changed, 24 insertions, 13 deletions

diff --git a/series b/series
index c57d733..daee3e2 100644
--- a/series
+++ b/series
@@ -1,2 +1,3 @@
 #test-modules.patch
+#test-console-blocked.patch
 config-no-printk.patch
diff --git a/kmsg-test-console-blocked.patch b/test-console-blocked.patch
index 02e333c..58ab811 100644
--- a/kmsg-test-console-blocked.patch
+++ b/test-console-blocked.patch
@@ -1,16 +1,17 @@
 diff --git a/init/main.c b/init/main.c
-index b5cc0a7..23a72d6 100644
+index b5cc0a7..640623a 100644
 --- a/init/main.c
 +++ b/init/main.c
-@@ -68,6 +68,7 @@
+@@ -68,6 +68,8 @@
  #include <linux/shmem_fs.h>
  #include <linux/slab.h>
  #include <linux/perf_event.h>
 +#include <linux/console.h>
++#include <linux/mm.h>
  
  #include <asm/io.h>
  #include <asm/bugs.h>
-@@ -462,6 +463,16 @@ static void __init mm_init(void)
+@@ -462,6 +464,16 @@ static void __init mm_init(void)
  	vmalloc_init();
  }
  
@@ -27,7 +28,7 @@ index b5cc0a7..23a72d6 100644
  asmlinkage void __init start_kernel(void)
  {
  	char * command_line;
-@@ -562,6 +573,24 @@ asmlinkage void __init start_kernel(void)
+@@ -562,6 +574,33 @@ asmlinkage void __init start_kernel(void)
  
  	kmem_cache_init_late();
  
@@ -36,23 +37,32 @@ index b5cc0a7..23a72d6 100644
 +	smp_call_function_single(1, contprint, NULL, 1);
 +	smp_call_function_single(0, contprint, NULL, 1);
 +	smp_call_function_single(1, contprint, NULL, 1);
++
++	show_free_areas(0);
++
 +	{
-+		int i, j;
++		int i;
 +
-+		for (i = 0; i < 8; i++) {
-+			printk("\n+++");
-+			for (j = 0; j < 8; j++)
-+				printk("-%i-%i-", i, j);
-+		}
-+		printk("\n");
++		pr_info("[");
++		for (i = 0; i < 4; i++)
++			pr_cont("%i ", i);
++		pr_cont("]\n");
 +	}
-+
 +	console_unlock();
 +
++	{
++		int i;
++
++		pr_info("[");
++		for (i = 0; i < 4; i++)
++			pr_cont("%i ", i);
++		pr_cont("]\n");
++	}
++
  	/*
  	 * HACK ALERT! This is early. We're enabling the console before
  	 * we've done PCI setups etc, and console_init() must be aware of
-@@ -864,6 +893,13 @@ static int __init kernel_init(void * unused)
+@@ -864,6 +903,13 @@ static int __init kernel_init(void * unused)
  
  	do_basic_setup();