projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fce6e03
)
include/linux/printk.h: remove double asmlinkage in printk_emit
author
Simon Kågström
<simon.kagstrom@netinsight.net>
Thu, 3 Apr 2014 21:48:44 +0000
(14:48 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Thu, 3 Apr 2014 23:21:08 +0000
(16:21 -0700)
The double asmlinkage was introduced in commit
7ff9554bb578
("printk:
convert byte-buffer to variable-length record buffer").
Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/printk.h
patch
|
blob
|
history
diff --git
a/include/linux/printk.h
b/include/linux/printk.h
index 8860575899f21687a9947055f915a561c1fca640..8752f7595b2759712f760c3924a2110fef5ca7d5 100644
(file)
--- a/
include/linux/printk.h
+++ b/
include/linux/printk.h
@@
-120,9
+120,9
@@
asmlinkage __printf(1, 0)
int vprintk(const char *fmt, va_list args);
asmlinkage __printf(5, 6) __cold
-
asmlinkage
int printk_emit(int facility, int level,
-
const char *dict, size_t dictlen,
-
const char *fmt, ...);
+int printk_emit(int facility, int level,
+ const char *dict, size_t dictlen,
+ const char *fmt, ...);
asmlinkage __printf(1, 2) __cold
int printk(const char *fmt, ...);