From patchwork Tue Jun 23 03:51:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 217352 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=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=unavailable 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 D511EC433E1 for ; Tue, 23 Jun 2020 03:51:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B5C39207DD for ; Tue, 23 Jun 2020 03:51:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="RdRRL9W5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731910AbgFWDvj (ORCPT ); Mon, 22 Jun 2020 23:51:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731216AbgFWDvj (ORCPT ); Mon, 22 Jun 2020 23:51:39 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24235C061573; Mon, 22 Jun 2020 20:51:39 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49rXQJ0Lntz9sRf; Tue, 23 Jun 2020 13:51:35 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1592884296; bh=oX9hOgZTi2rUuknzxDFes0F/Fx3ZrN09adoPuWtwlKk=; h=Date:From:To:Cc:Subject:From; b=RdRRL9W54vURvfOUEWzWUFe1JpkpN0tDYndnweuzgGaGj1ePw7uiP/AAPFG0c3IqQ zko8ab81ATU4iUSD83BXpFSPsuSVRJ0olTpQiRFUiUpDpg4xbNWZdnuXmxlj4kRQOu 2T5mgwIJfSqGw+ScRyDQBZuRSiRsksFU7HG/IjmpEYSd6iIVKOPKLV6UqjT1/Z5r+d lSLOLOrp9q+tKG4gQ7ulyhA1ixrTcLz2AE5Tojr9ZsUHbQo2FuRTFPw7R3gUnHv2Lg lfuWn++buyOthJ6OZqYUI23ghBBpMfKwCcKRyq2d1tsjsJqiM1cuT/Qu9x7hm7p/B0 8HC8QEmGAFGhA== Date: Tue, 23 Jun 2020 13:51:34 +1000 From: Stephen Rothwell To: Kees Cook , David Miller , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , Parav Pandit Subject: linux-next: build failure after merge of the kspp tree Message-ID: <20200623135134.61741e78@canb.auug.org.au> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, After merging the kspp tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: net/core/devlink.c: In function 'devlink_nl_port_function_attrs_put': net/core/devlink.c:586:3: warning: parameter names (without types) in function declaration 586 | int uninitialized_var(hw_addr_len); | ^~~ net/core/devlink.c:589:65: error: 'hw_addr_len' undeclared (first use in this function); did you mean 'hw_addr'? 589 | err = ops->port_function_hw_addr_get(devlink, port, hw_addr, &hw_addr_len, extack); | ^~~~~~~~~~~ | hw_addr net/core/devlink.c:589:65: note: each undeclared identifier is reported only once for each function it appears in Caused by commit 2e6d06799c15 ("compiler: Remove uninitialized_var() macro") interacting with commit 2a916ecc4056 ("net/devlink: Support querying hardware address of port function") from the net-next tree. I have added the following merge fix patch. From: Stephen Rothwell Date: Tue, 23 Jun 2020 13:43:06 +1000 Subject: [PATCH] net/core/devlink.c: remove new uninitialized_var() usage Signed-off-by: Stephen Rothwell --- net/core/devlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/devlink.c b/net/core/devlink.c index 455998a57671..6ae36808c152 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -583,7 +583,7 @@ devlink_nl_port_function_attrs_put(struct sk_buff *msg, struct devlink_port *por ops = devlink->ops; if (ops->port_function_hw_addr_get) { - int uninitialized_var(hw_addr_len); + int hw_addr_len; u8 hw_addr[MAX_ADDR_LEN]; err = ops->port_function_hw_addr_get(devlink, port, hw_addr, &hw_addr_len, extack);