| Message ID | 20200623135134.61741e78@canb.auug.org.au |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | linux-next: build failure after merge of the kspp tree | expand |
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Tue, 23 Jun 2020 13:51:34 +1000 > I have added the following merge fix patch. > > From: Stephen Rothwell <sfr@canb.auug.org.au> > 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 <sfr@canb.auug.org.au> Applied, thanks Stephen.
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);
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 <sfr@canb.auug.org.au> 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 <sfr@canb.auug.org.au> --- net/core/devlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)