fix !CONFIG_PRINTK

1 files changed, 12 insertions, 6 deletions

diff --git a/03-kmsg-cont-order.patch b/03-kmsg-cont-order.patch
index 8221eb1..dcf3d78 100644
--- a/03-kmsg-cont-order.patch
+++ b/03-kmsg-cont-order.patch
@@ -1,6 +1,6 @@
 ---
- kernel/printk.c |   87 +++++++++++++++++++++++++++++++++++++++-----------------
- 1 file changed, 62 insertions(+), 25 deletions(-)
+ kernel/printk.c |   89 ++++++++++++++++++++++++++++++++++++++++----------------
+ 1 file changed, 64 insertions(+), 25 deletions(-)
 
 --- a/kernel/printk.c
 +++ b/kernel/printk.c
@@ -99,7 +99,13 @@
  		}
  
  		if (!stored)
-@@ -1665,6 +1688,7 @@ static enum log_flags syslog_prev;
+@@ -1661,10 +1684,13 @@ EXPORT_SYMBOL(printk);
+ #define LOG_LINE_MAX 0
+ static u64 syslog_seq;
+ static u32 syslog_idx;
++static u64 console_seq;
++static u32 console_idx;
+ static enum log_flags syslog_prev;
  static u64 log_first_seq;
  static u32 log_first_idx;
  static u64 log_next_seq;
@@ -107,7 +113,7 @@
  static struct cont {
  	size_t len;
  	size_t cons;
-@@ -1948,10 +1972,34 @@ void wake_up_klogd(void)
+@@ -1948,10 +1974,34 @@ void wake_up_klogd(void)
  		this_cpu_or(printk_pending, PRINTK_PENDING_WAKEUP);
  }
  
@@ -146,7 +152,7 @@
  
  /**
   * console_unlock - unlock the console system
-@@ -1983,19 +2031,7 @@ void console_unlock(void)
+@@ -1983,19 +2033,7 @@ void console_unlock(void)
  	console_may_schedule = 0;
  
  	/* flush buffered message fragment immediately to console */
@@ -167,7 +173,7 @@
  again:
  	for (;;) {
  		struct log *msg;
-@@ -2032,6 +2068,7 @@ skip:
+@@ -2032,6 +2070,7 @@ skip:
  			 * will properly dump everything later.
  			 */
  			msg->flags &= ~LOG_NOCONS;