From: Jim Cromie <jim.cromie@gmail.com>
To: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org
Cc: gregkh@linux-foundation.org, Jim Cromie <jim.cromie@gmail.com>,
Markus Trippelsdorf <markus@trippelsdorf.de>
Subject: [PATCH] dyndbg: fix for SOH in logging messages
Date: Sat, 18 Aug 2012 18:35:51 -0600 [thread overview]
Message-ID: <1345336551-10066-1-git-send-email-jim.cromie@gmail.com> (raw)
commit af7f2158fde was done against master, and clashed with structured logging's change of KERN_LEVEL to SOH.
Bisected and fixed by Markus Trippelsdorf.
CC: Markus Trippelsdorf <markus@trippelsdorf.de>
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
drivers/base/core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/base/core.c b/drivers/base/core.c
index cdd01c5..5e6e00b 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1912,8 +1912,8 @@ int __dev_printk(const char *level, const struct device *dev,
"DEVICE=+%s:%s", subsys, dev_name(dev));
}
skip:
- if (level[3])
- level_extra = &level[3]; /* skip past "<L>" */
+ if (level[2])
+ level_extra = &level[2]; /* skip past KERN_SOH "L" */
return printk_emit(0, level[1] - '0',
dictlen ? dict : NULL, dictlen,
--
1.7.10.1.487.ga3935e6
next reply other threads:[~2012-08-19 0:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-19 0:35 Jim Cromie [this message]
2012-08-19 6:13 ` [PATCH] dyndbg: fix for SOH in logging messages Greg KH
2012-08-19 6:33 ` Greg KH
2012-08-19 6:37 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345336551-10066-1-git-send-email-jim.cromie@gmail.com \
--to=jim.cromie@gmail.com \
--cc=gregkh@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=markus@trippelsdorf.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).