projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] /dev/mem: validate mmap requests
[powerpc.git]
/
kernel
/
printk.c
diff --git
a/kernel/printk.c
b/kernel/printk.c
index
ac8a08f
..
2251be8
100644
(file)
--- a/
kernel/printk.c
+++ b/
kernel/printk.c
@@
-569,7
+569,7
@@
asmlinkage int vprintk(const char *fmt, va_list args)
p[1] <= '7' && p[2] == '>') {
loglev_char = p[1];
p += 3;
p[1] <= '7' && p[2] == '>') {
loglev_char = p[1];
p += 3;
- printed_len
+
= 3;
+ printed_len
-
= 3;
} else {
loglev_char = default_message_loglevel
+ '0';
} else {
loglev_char = default_message_loglevel
+ '0';
@@
-584,7
+584,7
@@
asmlinkage int vprintk(const char *fmt, va_list args)
for (tp = tbuf; tp < tbuf + tlen; tp++)
emit_log_char(*tp);
for (tp = tbuf; tp < tbuf + tlen; tp++)
emit_log_char(*tp);
- printed_len += tlen
- 3
;
+ printed_len += tlen;
} else {
if (p[0] != '<' || p[1] < '0' ||
p[1] > '7' || p[2] != '>') {
} else {
if (p[0] != '<' || p[1] < '0' ||
p[1] > '7' || p[2] != '>') {
@@
-592,8
+592,8
@@
asmlinkage int vprintk(const char *fmt, va_list args)
emit_log_char(default_message_loglevel
+ '0');
emit_log_char('>');
emit_log_char(default_message_loglevel
+ '0');
emit_log_char('>');
+ printed_len += 3;
}
}
- printed_len += 3;
}
log_level_unknown = 0;
if (!*p)
}
log_level_unknown = 0;
if (!*p)
@@
-956,7
+956,7
@@
int unregister_console(struct console *console)
if (console_drivers == console) {
console_drivers=console->next;
res = 0;
if (console_drivers == console) {
console_drivers=console->next;
res = 0;
- } else {
+ } else
if (console_drivers)
{
for (a=console_drivers->next, b=console_drivers ;
a; b=a, a=b->next) {
if (a == console) {
for (a=console_drivers->next, b=console_drivers ;
a; b=a, a=b->next) {
if (a == console) {