Re: [RFC/PATCH 1/2] swsusp: preserve boot-time printk output after resume

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Fri, 27 Apr 2007, Pavel Machek wrote:
> 1. This should not be a config option

Ok.

On Fri, 27 Apr 2007, Pavel Machek wrote:
> 2. This does not work. pointers are nosave, but logbuf is not. Eh?

My bad, sorry. Thanks for the comments, Pavel!

			Pekka

[PATCH] kernel: preserve boot-time printk output after resume
From: Nigel Cunningham <nigel@xxxxxxxxxxxxxxxxxx>

This makes the kernel preserve boot-time printk() output after resume.

Cc: Pavel Machek <pavel@xxxxxx>
Cc: Rafael J. Wysocki <rjw@xxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
---
 kernel/printk.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Index: 2.6/kernel/printk.c
===================================================================
--- 2.6.orig/kernel/printk.c	2007-04-27 15:39:26.000000000 +0300
+++ 2.6/kernel/printk.c	2007-04-27 15:49:25.000000000 +0300
@@ -92,9 +92,9 @@ static DEFINE_SPINLOCK(logbuf_lock);
  * The indices into log_buf are not constrained to log_buf_len - they
  * must be masked before subscripting
  */
-static unsigned long log_start;	/* Index into log_buf: next char to be read by syslog() */
-static unsigned long con_start;	/* Index into log_buf: next char to be sent to consoles */
-static unsigned long log_end;	/* Index into log_buf: most-recently-written-char + 1 */
+static unsigned long __nosavedata log_start;	/* Index into log_buf: next char to be read by syslog() */
+static unsigned long __nosavedata con_start;	/* Index into log_buf: next char to be sent to consoles */
+static unsigned long __nosavedata log_end;	/* Index into log_buf: most-recently-written-char + 1 */
 
 /*
  *	Array of consoles built from command line options (console=)
@@ -117,10 +117,10 @@ static int console_may_schedule;
 
 #ifdef CONFIG_PRINTK
 
-static char __log_buf[__LOG_BUF_LEN];
-static char *log_buf = __log_buf;
-static int log_buf_len = __LOG_BUF_LEN;
-static unsigned long logged_chars; /* Number of chars produced since last read+clear operation */
+static char __nosavedata __log_buf[__LOG_BUF_LEN];
+static char __nosavedata *log_buf = __log_buf;
+static int __nosavedata log_buf_len = __LOG_BUF_LEN;
+static unsigned long __nosavedata logged_chars; /* Number of chars produced since last read+clear operation */
 
 static int __init log_buf_len_setup(char *str)
 {
_______________________________________________
linux-pm mailing list
linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/linux-pm

[Index of Archives]     [Linux ACPI]     [Netdev]     [Ethernet Bridging]     [Linux Wireless]     [CPU Freq]     [Kernel Newbies]     [Fedora Kernel]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux