From: Simon Kågström Date: Thu, 3 Apr 2014 21:48:44 +0000 (-0700) Subject: include/linux/printk.h: remove double asmlinkage in printk_emit X-Git-Tag: firefly_0821_release~176^2~4160^2~120 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d487d57581057abd271651334ea2996aa1b31e28;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- 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, ...);