diff options
| author | Simon Kågström <simon.kagstrom@netinsight.net> | 2014-04-03 14:48:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-03 16:21:08 -0700 |
| commit | d487d57581057abd271651334ea2996aa1b31e28 (patch) | |
| tree | 36a49aeee45632292b7d7848b3596d056df05937 /include/linux/printk.h | |
| parent | fce6e0338abe910ba6d4db0657ae8adc6aa1a72b (diff) | |
| download | linux-stable-d487d57581057abd271651334ea2996aa1b31e28.tar.gz linux-stable-d487d57581057abd271651334ea2996aa1b31e28.tar.bz2 linux-stable-d487d57581057abd271651334ea2996aa1b31e28.zip | |
include/linux/printk.h: remove double asmlinkage in printk_emit
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>
Diffstat (limited to 'include/linux/printk.h')
| -rw-r--r-- | include/linux/printk.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/printk.h b/include/linux/printk.h index 8860575899f2..8752f7595b27 100644 --- 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, ...); |