From patchwork Tue Apr 9 21:25:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1082827 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="G82ZdSPq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44f0jG0Qmsz9sRJ for ; Wed, 10 Apr 2019 07:26:42 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726744AbfDIVZ7 (ORCPT ); Tue, 9 Apr 2019 17:25:59 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:34000 "EHLO mail-ed1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726580AbfDIVZz (ORCPT ); Tue, 9 Apr 2019 17:25:55 -0400 Received: by mail-ed1-f66.google.com with SMTP id x14so151459eds.1 for ; Tue, 09 Apr 2019 14:25:53 -0700 (PDT) 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=8KN4q20HRUQBAdf+paD/ffQpCN5tvmQdqpoiavL9WR4=; b=G82ZdSPq0Rot6o3lKKasjZMa+n0D3x81mT0LEpd08rBCmJP5aCIS+t6gyjf4dd3qt9 B61dGodhXZoGr+r58ljQgYP4AINfcPMu5yZRE93NnYY9SHMFwxRWQShueEqf/morqNKF 5S1vcS5JaYoNIPAUPVS3E6sQ/HVhFWvXjXIhA= 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=8KN4q20HRUQBAdf+paD/ffQpCN5tvmQdqpoiavL9WR4=; b=tWBj4J4gZcbpCeF6paTyQJEki/u+bjLCzeawlAzc03JrFC4tezS8uw5W5eN11e9pNB wz3kQTKvkONJR2UKAIxaJYnCPfB3FwsVUJ7Gw0nL2GNPRxXMIA3V9Ok8M4+SnY0cbOyW DjIR3ZVLBs1Kzx6h+YQcfQI4ojuO8SvfFpAz/BaXjPImUznAtAo7uIr1ohqyoZO8cDe1 kSJpqP2HscMGu2asZ5rZVuzsrsSRli+LdmWF5J4EmxIKRgvWzOcxGwvd4ipDCFxrWsKW lnoPKGLV9lEvkmaX6iY1ipQV5pjArrrGgOuoyrG6wIylqyHwQpgZkuKgz/chpG9OB1lI hmQg== X-Gm-Message-State: APjAAAUlFF/2ZCS7pVqSTaEm4QZ8cbAQerj54OhluQMia2ByWtq/q14o 843bBwn1BfvqN9PWRXW7UwRrCC1UWM3vWjaO X-Google-Smtp-Source: APXvYqzyJejyNdbpvNpdxhygYigUxm7wvBSO92k5fpaDlrWSpS9pBpnqu+zwmpfKptcJDbe7RdfqIw== X-Received: by 2002:a50:a4db:: with SMTP id x27mr24655365edb.120.1554845153314; Tue, 09 Apr 2019 14:25:53 -0700 (PDT) Received: from prevas-ravi.prevas.se (ip-5-186-118-63.cgn.fibianet.dk. [5.186.118.63]) by smtp.gmail.com with ESMTPSA id i26sm3477986ejc.51.2019.04.09.14.25.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 14:25:52 -0700 (PDT) From: Rasmus Villemoes To: Andrew Morton Cc: Jason Baron , linux-kernel@vger.kernel.org, Rasmus Villemoes , netdev@vger.kernel.org Subject: [PATCH 02/10] linux/net.h: use unique identifier for each struct _ddebug Date: Tue, 9 Apr 2019 23:25:09 +0200 Message-Id: <20190409212517.7321-3-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409212517.7321-1-linux@rasmusvillemoes.dk> References: <20190409212517.7321-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 c606c72311d0..828e0db1e63a 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -266,7 +266,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) && \ @@ -274,6 +274,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__)