summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-07-10 22:57:15 +0200
committerKay Sievers <kay@vrfy.org>2012-07-10 22:57:15 +0200
commit2a0551107628f71eba4f48183e9fa072d29e7bc0 (patch)
treee6868b9d6a1b67f85fefd1770b69044d310ecd60
parent45aee3b0cc20a4314e7db200a87d188493fd65c6 (diff)
downloadpatches-2a0551107628f71eba4f48183e9fa072d29e7bc0.tar.gz
add changelog
-rw-r--r--config-no-printk.patch32
1 files changed, 12 insertions, 20 deletions
diff --git a/config-no-printk.patch b/config-no-printk.patch
index d3fc5b8..e07302a 100644
--- a/config-no-printk.patch
+++ b/config-no-printk.patch
@@ -1,38 +1,30 @@
+From: Kay Sievers <kay@vrfy.org>
+Subject: kmsg - avoid warning for CONFIG_PRINTK=n compilations
+
+Signed-off-by: Kay Sievers <kay@vrfy.org>
---
- kernel/printk.c | 22 ++++++++++++++--------
- 1 file changed, 14 insertions(+), 8 deletions(-)
+
+ kernel/printk.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
--- a/kernel/printk.c
+++ b/kernel/printk.c
-@@ -216,21 +216,21 @@ struct log {
+@@ -216,6 +216,7 @@ struct log {
*/
static DEFINE_RAW_SPINLOCK(logbuf_lock);
--/* the next printk record to read by syslog(READ) or /proc/kmsg */
--static u64 syslog_seq;
--static u32 syslog_idx;
--static enum log_flags syslog_prev;
--static size_t syslog_partial;
--
+#ifdef CONFIG_PRINTK
- /* index and sequence number of the first record stored in the buffer */
- static u64 log_first_seq;
- static u32 log_first_idx;
+ /* the next printk record to read by syslog(READ) or /proc/kmsg */
+ static u64 syslog_seq;
+ 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 */
static u64 log_next_seq;
-#ifdef CONFIG_PRINTK
static u32 log_next_idx;
-+/* the next printk record to read by syslog(READ) or /proc/kmsg */
-+static u64 syslog_seq;
-+static u32 syslog_idx;
-+static enum log_flags syslog_prev;
-+static size_t syslog_partial;
-+
/* the next printk record to read after the last 'clear' command */
- static u64 clear_seq;
- static u32 clear_idx;
@@ -1631,9 +1631,15 @@ asmlinkage int printk(const char *fmt, .
}
EXPORT_SYMBOL(printk);