From patchwork Fri Nov 9 23:10:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 995781 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=rasmusvillemoes.dk Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=rasmusvillemoes.dk header.i=@rasmusvillemoes.dk header.b="A8wzIs5W"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42sG9W0mRTz9sDN for ; Sat, 10 Nov 2018 10:11:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728748AbeKJIxw (ORCPT ); Sat, 10 Nov 2018 03:53:52 -0500 Received: from mail-lf1-f67.google.com ([209.85.167.67]:41980 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728672AbeKJIxu (ORCPT ); Sat, 10 Nov 2018 03:53:50 -0500 Received: by mail-lf1-f67.google.com with SMTP id c16so2492482lfj.8 for ; Fri, 09 Nov 2018 15:11:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HXZ474A5qatt+7Auyj7430sAVnYt/gcAddDmQbWpJtw=; b=A8wzIs5WmkiW9d2evMfg9DM5rXANVGFJNlEQva8hfqMrWTg7ye80vm2QBiM4VjpAoT QQeJ9LAe3bmxpOHdSxKWuLc0tJGPaGvKu4ii76OZAtkIORdx0K2UHG5FeegFQXt3HYu0 u6VZOKOohBSTUTOa56YPCieJ0Xn0SNzncTkKQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HXZ474A5qatt+7Auyj7430sAVnYt/gcAddDmQbWpJtw=; b=nANSEvmPYuc7+bkgd2pIzAveRtB438D+GPY/zT8po4Z0xvB/SvhtcCDRhIIbFTVLeg ib8A3KuzLYpaFHPoceHsAh/O3nKL+BZ6NCcc8lZqms3U5MX84x7IoefYjaWBqeeDqVsV bTUOlzPmbUJ35X03bQj7j7dwKSIo+xKyOL8DdkVRMZeQXG2NMK1MKEvS39iRShfQ6HOH bA5lADFW8dUDAcyo4U6SIPde2HyRwm+D6NGr1LUgqZU85bhZyswDaI+uOgZ1dXxQYFQp 56ZmW11EcywLRoCiVC2fCLDtc84hsUiZZ1LuVqwt0KVGHDx8X7q/lNhF5ROagsSFySK0 d63A== X-Gm-Message-State: AGRZ1gKmZo3lToONM+kJtRyl5UpT2PZr7Isu0AWSrXWEBk1eeYUmNw3y wPRnufJoRkKRJ5tIqnRiyH1vHCxFzcoEjQ== X-Google-Smtp-Source: AJdET5dKL0OqzgnRyqEeSg8inKRAA5do6EA7lslSRziqjZ8Ho9mFZfAoll4PzzQUztsy88XNO+yCYw== X-Received: by 2002:a19:6514:: with SMTP id z20mr6146264lfb.31.1541805064785; Fri, 09 Nov 2018 15:11:04 -0800 (PST) Received: from prevas-ravi.prevas.se (dhcp-5-186-114-252.cgn.ip.fibianet.dk. [5.186.114.252]) by smtp.gmail.com with ESMTPSA id x16sm1584012lff.26.2018.11.09.15.11.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Nov 2018 15:11:04 -0800 (PST) From: Rasmus Villemoes To: Andrew Morton , Jason Baron Cc: linux-kernel@vger.kernel.org, Rasmus Villemoes , netdev@vger.kernel.org Subject: [PATCH v3 04/23] linux/net.h: use unique identifier for each struct _ddebug Date: Sat, 10 Nov 2018 00:10:02 +0100 Message-Id: <20181109231021.11658-5-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.19.1.6.gbde171bbf5 In-Reply-To: <20181109231021.11658-1-linux@rasmusvillemoes.dk> References: <20181009112013.14238-1-linux@rasmusvillemoes.dk> <20181109231021.11658-1-linux@rasmusvillemoes.dk> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Changes on x86-64 later in this series require that all struct _ddebug descriptors in a translation unit uses distinct identifiers. Realize that for net_dbg_ratelimited by generating such an identifier via __UNIQUE_ID and pass that to an extra level of macros. No functional change. Cc: netdev@vger.kernel.org Acked-by: Jason Baron Signed-off-by: Rasmus Villemoes --- include/linux/net.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/linux/net.h b/include/linux/net.h index 651fca72286c..397243a25f56 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -260,7 +260,7 @@ do { \ #define net_info_ratelimited(fmt, ...) \ net_ratelimited_function(pr_info, fmt, ##__VA_ARGS__) #if defined(CONFIG_DYNAMIC_DEBUG) -#define net_dbg_ratelimited(fmt, ...) \ +#define _net_dbg_ratelimited(descriptor, fmt, ...) \ do { \ DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \ if (DYNAMIC_DEBUG_BRANCH(descriptor) && \ @@ -268,6 +268,8 @@ do { \ __dynamic_pr_debug(&descriptor, pr_fmt(fmt), \ ##__VA_ARGS__); \ } while (0) +#define net_dbg_ratelimited(fmt, ...) \ + _net_dbg_ratelimited(__UNIQUE_ID(ddebug), fmt, ##__VA_ARGS__) #elif defined(DEBUG) #define net_dbg_ratelimited(fmt, ...) \ net_ratelimited_function(pr_debug, fmt, ##__VA_ARGS__)