From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762782Ab2KBNiJ (ORCPT ); Fri, 2 Nov 2012 09:38:09 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:2638 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753358Ab2KBNfD (ORCPT ); Fri, 2 Nov 2012 09:35:03 -0400 X-Authority-Analysis: v=2.0 cv=KcBQQHkD c=1 sm=0 a=rXTBtCOcEpjy1lPqhTCpEQ==:17 a=mNMOxpOpBa8A:10 a=Ciwy3NGCPMMA:10 a=0LCmfyQi0W0A:10 a=5SG0PmZfjMsA:10 a=bbbx4UPp9XUA:10 a=meVymXHHAAAA:8 a=PsjSUhCDCwAA:10 a=VwQbUJbxAAAA:8 a=yJ_xBFoeKshuyOfMLuQA:9 a=QEXdDO2ut3YA:10 a=tcl5Gpyx7pQA:10 a=jeBq3FmKZ4MA:10 a=wBUZjTxk0ZusBJBfGwUA:9 a=rXTBtCOcEpjy1lPqhTCpEQ==:117 X-Cloudmark-Score: 0 X-Originating-IP: 74.67.115.198 Message-Id: <20121102133459.970876400@goodmis.org> User-Agent: quilt/0.60-1 Date: Fri, 02 Nov 2012 09:33:03 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Frederic Weisbecker , Michal Hocko Subject: [PATCH 11/22] linux/kernel.h: Remove duplicate trace_printk declaration References: <20121102133251.998500247@goodmis.org> Content-Disposition: inline; filename=0011-linux-kernel.h-Remove-duplicate-trace_printk-declara.patch Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="00GvhwF7k39YY" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --00GvhwF7k39YY Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable From: Michal Hocko !CONFIG_TRACING both declares and defines (empty) trace_printk. The first one is not redundant so it can be removed. Link: http://lkml.kernel.org/r/1351172511-18125-1-git-send-email-mhocko@sus= e.cz Signed-off-by: Michal Hocko Signed-off-by: Steven Rostedt --- include/linux/kernel.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/include/linux/kernel.h b/include/linux/kernel.h index a123b13..7785d5d 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -527,9 +527,6 @@ __ftrace_vprintk(unsigned long ip, const char *fmt, va_= list ap); =20 extern void ftrace_dump(enum ftrace_dump_mode oops_dump_mode); #else -static inline __printf(1, 2) -int trace_printk(const char *fmt, ...); - static inline void tracing_start(void) { } static inline void tracing_stop(void) { } static inline void ftrace_off_permanent(void) { } @@ -539,8 +536,8 @@ static inline void tracing_on(void) { } static inline void tracing_off(void) { } static inline int tracing_is_on(void) { return 0; } =20 -static inline int -trace_printk(const char *fmt, ...) +static inline __printf(1, 2) +int trace_printk(const char *fmt, ...) { return 0; } --=20 1.7.10.4 --00GvhwF7k39YY Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAABAgAGBQJQk8wEAAoJEOdOSU1xswtMTHYH/3RHE+pTAIo6LAq7cfUsyUiu 4PTdbsH0EYanB/T5P9DmaNXgpSNCZ7fNbTkU1l2Mz+AcBliTPL9y5BLfQl4WNBjh hQ5ZA2Drp5aZx6JqkdcPfRkbRhtpOSFAi2tkovFfB2r/xGXbf7YgCwgFTm9vavxo TzIkdO7wqafdkIBmlEuE705RJBggzxYB+9jvvqNVahtEjvGfg0EwdI3GECDDe7Wt wJZwdztNZNzqozG2gFYKKDUzLvuNZPj+dzB+69SGQxLYnN+EVs3hMT9/r2XPWbb2 61V674JZzf5aymmhtDEcm8WOry82TGv7xNjVc9OHAFhKFcqnyr3CaWJnw3v9CFA= =39pT -----END PGP SIGNATURE----- --00GvhwF7k39YY--