From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4655C3A5A0 for ; Mon, 19 Aug 2019 21:30:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BE525206C1 for ; Mon, 19 Aug 2019 21:30:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728615AbfHSVaP (ORCPT ); Mon, 19 Aug 2019 17:30:15 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:49491 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728427AbfHSVaL (ORCPT ); Mon, 19 Aug 2019 17:30:11 -0400 Received: from localhost ([127.0.0.1] helo=vostro.local) by Galois.linutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1hzpDw-0004ki-IF; Mon, 19 Aug 2019 23:29:56 +0200 From: John Ogness To: linux-kernel@vger.kernel.org Cc: Peter Zijlstra , Petr Mladek , Sergey Senozhatsky , Steven Rostedt , Linus Torvalds , Greg Kroah-Hartman , Andrea Parri , Thomas Gleixner , Sergey Senozhatsky , Brendan Higgins Subject: [PATCH] printk-rb: fix test module macro usage References: <20190807222634.1723-1-john.ogness@linutronix.de> <20190807222634.1723-7-john.ogness@linutronix.de> Date: Mon, 19 Aug 2019 23:29:54 +0200 In-Reply-To: <20190807222634.1723-7-john.ogness@linutronix.de> (John Ogness's message of "Thu, 8 Aug 2019 00:32:31 +0206") Message-ID: <87blwkvo6l.fsf_-_@linutronix.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org DECLARE_PRINTKRB() now requires a wait queue argument, used by the blocking reader interface. Signed-off-by: John Ogness --- For RFCv4 the macro prototype changed. The fixup for the test module didn't make it into the series. kernel/printk/test_prb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/printk/test_prb.c b/kernel/printk/test_prb.c index 0157bbdf051f..49bcf831af7e 100644 --- a/kernel/printk/test_prb.c +++ b/kernel/printk/test_prb.c @@ -6,8 +6,11 @@ #include #include #include +#include #include "ringbuffer.h" +DECLARE_WAIT_QUEUE_HEAD(test_wait); + /* * This is a test module that starts "num_online_cpus() - 1" writer threads * and 1 reader thread. The writer threads each write strings of varying @@ -63,7 +66,7 @@ static void dump_rb(struct printk_ringbuffer *rb) trace_printk("END full dump\n"); } -DECLARE_PRINTKRB(test_rb, 5, 7); +DECLARE_PRINTKRB(test_rb, 5, 7, &test_wait); static int prbtest_writer(void *data) { -- 2.20.1