lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kmsg - avoid warning for CONFIG_PRINTK=n compilations

Browse Source 
Signed-off-by: Kay Sievers <kay@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kay Sievers
2012-07-16 18:35:29 -07:00
committed by Greg Kroah-Hartman
parent 7049825318
commit 96efedf149
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/printk.c
View File

@@ -216,6 +216,7 @@ struct log {
*/ */
static DEFINE_RAW_SPINLOCK(logbuf_lock); static DEFINE_RAW_SPINLOCK(logbuf_lock);
#ifdef CONFIG_PRINTK
/* the next printk record to read by syslog(READ) or /proc/kmsg */ /* the next printk record to read by syslog(READ) or /proc/kmsg */
static u64 syslog_seq; static u64 syslog_seq;
static u32 syslog_idx; static u32 syslog_idx;
@@ -228,7 +229,6 @@ static u32 log_first_idx;
/* index and sequence number of the next record to store in the buffer */ /* index and sequence number of the next record to store in the buffer */
static u64 log_next_seq; static u64 log_next_seq;
#ifdef CONFIG_PRINTK
static u32 log_next_idx; static u32 log_next_idx;
/* the next printk record to read after the last 'clear' command */ /* the next printk record to read after the last 'clear' command */
@@ -1635,10 +1635,17 @@ asmlinkage int printk(const char *fmt, ...)
} }
EXPORT_SYMBOL(printk); EXPORT_SYMBOL(printk);
#else #else /* CONFIG_PRINTK */
#define LOG_LINE_MAX 0 #define LOG_LINE_MAX 0
#define PREFIX_MAX 0 #define PREFIX_MAX 0
#define LOG_LINE_MAX 0
static u64 syslog_seq;
static u32 syslog_idx;
static enum log_flags syslog_prev;
static u64 log_first_seq;
static u32 log_first_idx;
static u64 log_next_seq;
static struct cont { static struct cont {
size_t len; size_t len;
size_t cons; size_t cons;