From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755108AbcGHMJK (ORCPT ); Fri, 8 Jul 2016 08:09:10 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52454 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754833AbcGHMJC (ORCPT ); Fri, 8 Jul 2016 08:09:02 -0400 Date: Fri, 8 Jul 2016 05:08:01 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, hpa@zytor.com, luto@kernel.org, mingo@kernel.org, peterz@infradead.org, brgerst@gmail.com, tglx@linutronix.de, luto@amacapital.net, torvalds@linux-foundation.org, jpoimboe@redhat.com, fweisbec@gmail.com, dvlasenk@redhat.com, bp@suse.de, bp@alien8.de Reply-To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, mingo@kernel.org, luto@kernel.org, hpa@zytor.com, peterz@infradead.org, brgerst@gmail.com, torvalds@linux-foundation.org, tglx@linutronix.de, luto@amacapital.net, dvlasenk@redhat.com, fweisbec@gmail.com, jpoimboe@redhat.com, bp@suse.de, bp@alien8.de In-Reply-To: <1467671487-10344-3-git-send-email-bp@alien8.de> References: <1467671487-10344-3-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/debug] printk: Make the printk*once() variants return a value Git-Commit-ID: 069f0cd00df0abfb9252e0dbdc355e40e6ab75fc X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 069f0cd00df0abfb9252e0dbdc355e40e6ab75fc Gitweb: http://git.kernel.org/tip/069f0cd00df0abfb9252e0dbdc355e40e6ab75fc Author: Borislav Petkov AuthorDate: Tue, 5 Jul 2016 00:31:26 +0200 Committer: Ingo Molnar CommitDate: Fri, 8 Jul 2016 11:33:18 +0200 printk: Make the printk*once() variants return a value Have printk*once() return a bool which denotes whether the string was printed or not so that calling code can react accordingly. Signed-off-by: Borislav Petkov Cc: Andrew Morton Cc: Andy Lutomirski Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1467671487-10344-3-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- include/linux/printk.h | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/include/linux/printk.h b/include/linux/printk.h index f4da695..f136b22 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -108,11 +108,14 @@ struct va_format { * Dummy printk for disabled debugging statements to use whilst maintaining * gcc's format checking. */ -#define no_printk(fmt, ...) \ -do { \ - if (0) \ - printk(fmt, ##__VA_ARGS__); \ -} while (0) +#define no_printk(fmt, ...) \ +({ \ + do { \ + if (0) \ + printk(fmt, ##__VA_ARGS__); \ + } while (0); \ + 0; \ +}) #ifdef CONFIG_EARLY_PRINTK extern asmlinkage __printf(1, 2) @@ -309,20 +312,24 @@ extern asmlinkage void dump_stack(void) __cold; #define printk_once(fmt, ...) \ ({ \ static bool __print_once __read_mostly; \ + bool __ret_print_once = !__print_once; \ \ if (!__print_once) { \ __print_once = true; \ printk(fmt, ##__VA_ARGS__); \ } \ + unlikely(__ret_print_once); \ }) #define printk_deferred_once(fmt, ...) \ ({ \ static bool __print_once __read_mostly; \ + bool __ret_print_once = !__print_once; \ \ if (!__print_once) { \ __print_once = true; \ printk_deferred(fmt, ##__VA_ARGS__); \ } \ + unlikely(__ret_print_once); \ }) #else #define printk_once(fmt, ...) \