Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966173AbbFJPxc (ORCPT ); Wed, 10 Jun 2015 11:53:32 -0400 Received: from smtprelay0173.hostedemail.com ([216.40.44.173]:34391 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S966151AbbFJPxJ (ORCPT ); Wed, 10 Jun 2015 11:53:09 -0400 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::::,RULES_HIT:41:355:379:541:599:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1515:1516:1518:1534:1540:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:3138:3139:3140:3141:3142:3352:3622:3876:3877:4321:5007:6114:6261:6642:7875:10004:10400:10848:10967:11026:11232:11473:11658:11914:12296:12517:12519:12555:12740:13019:13069:13311:13357:14096:14097:21080,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0 X-HE-Tag: box79_5574e38a9ce44 X-Filterd-Recvd-Size: 1900 Date: Wed, 10 Jun 2015 11:53:05 -0400 From: Steven Rostedt To: Peter Zijlstra Cc: linux-kernel@vger.kernel.org, jkosina@suse.cz, paulmck@linux.vnet.ibm.com, pmladek@suse.cz, Ingo Molnar , Thomas Gleixner Subject: Re: [RFC][PATCH] printk: Fixup the nmi printk mess Message-ID: <20150610115305.669c53e9@gandalf.local.home> In-Reply-To: <20150610125509.GO19282@twins.programming.kicks-ass.net> References: <20150610125509.GO19282@twins.programming.kicks-ass.net> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1169 Lines: 39 On Wed, 10 Jun 2015 14:55:09 +0200 Peter Zijlstra wrote: > diff --git a/include/linux/printk.h b/include/linux/printk.h > index 9b30871c9149..ebe017327e6e 100644 > --- a/include/linux/printk.h > +++ b/include/linux/printk.h > @@ -120,7 +120,15 @@ static inline __printf(1, 2) __cold > void early_printk(const char *s, ...) { } > #endif > > -typedef int(*printk_func_t)(const char *fmt, va_list args); > +#ifdef CONFIG_PRINTK_NMI > +extern void printk_init(void); > +extern void printk_nmi_enter(void); > +extern void printk_nmi_exit(void); > +#else > +static inline void printk_init(void) { } > +static inline void printk_nmi_enter(void) { } > +static inline void printk_nmi_exit(void) { } > +#endif /* HAVE_NMI */ #endif /* PRINTK_NMI */ -- Steve > > #ifdef CONFIG_PRINTK > asmlinkage __printf(5, 0) > diff --git a/init/Kconfig b/init/Kconfig > index b999fa381bf9..fe9a439c8843 100644 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/