Subject: [merged] printk-remove-duplicated-check-for-log-level.patch removed from -mm tree
To: pmladek@xxxxxxx,fweisbec@xxxxxxxxx,jack@xxxxxxx,kay@xxxxxxxx,mhocko@xxxxxxx,rostedt@xxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 04 Apr 2014 12:32:46 -0700
The patch titled
Subject: printk: remove duplicated check for log level
has been removed from the -mm tree. Its filename was
printk-remove-duplicated-check-for-log-level.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Petr Mladek <pmladek@xxxxxxx>
Subject: printk: remove duplicated check for log level
The check for the exact log level is already done in printk_get_level. We
do not need to duplicate it in printk_skip_level.
Signed-off-by: Petr Mladek <pmladek@xxxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Jan Kara <jack@xxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxx>
Cc: Kay Sievers <kay@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/printk.h | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff -puN include/linux/printk.h~printk-remove-duplicated-check-for-log-level include/linux/printk.h
--- a/include/linux/printk.h~printk-remove-duplicated-check-for-log-level
+++ a/include/linux/printk.h
@@ -24,13 +24,9 @@ static inline int printk_get_level(const
static inline const char *printk_skip_level(const char *buffer)
{
- if (printk_get_level(buffer)) {
- switch (buffer[1]) {
- case '0' ... '7':
- case 'd': /* KERN_DEFAULT */
- return buffer + 2;
- }
- }
+ if (printk_get_level(buffer))
+ return buffer + 2;
+
return buffer;
}
_
Patches currently in -mm which might be from pmladek@xxxxxxx are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
