Skip to content
This repository has been archived by the owner on Sep 24, 2020. It is now read-only.

Rebase 4.14.71 patches onto 4.14.72 #256

Merged
merged 4 commits into from
Sep 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make

# Invoke a second make in the output directory, passing relevant variables
sub-make:
$(Q)$(MAKE) -C $(KBUILD_OUTPUT) KBUILD_SRC=$(CURDIR) \
$(Q)$(MAKE) -C $(KBUILD_OUTPUT) \
KBUILD_SRC=$(shell realpath --relative-to=$(KBUILD_OUTPUT) $(CURDIR)) \
-f $(CURDIR)/Makefile $(filter-out _all sub-make,$(MAKECMDGOALS))

# Leave processing to above invocation of make
Expand Down
11 changes: 6 additions & 5 deletions drivers/net/xen-netfront.c
Original file line number Diff line number Diff line change
Expand Up @@ -1818,7 +1818,7 @@ static int talk_to_netback(struct xenbus_device *dev,
err = xen_net_read_mac(dev, info->netdev->dev_addr);
if (err) {
xenbus_dev_fatal(dev, err, "parsing %s/mac", dev->nodename);
goto out;
goto out_unlocked;
}

rtnl_lock();
Expand Down Expand Up @@ -1933,6 +1933,7 @@ static int talk_to_netback(struct xenbus_device *dev,
xennet_destroy_queues(info);
out:
rtnl_unlock();
out_unlocked:
device_unregister(&dev->dev);
return err;
}
Expand All @@ -1958,10 +1959,6 @@ static int xennet_connect(struct net_device *dev)
/* talk_to_netback() sets the correct number of queues */
num_queues = dev->real_num_tx_queues;

rtnl_lock();
netdev_update_features(dev);
rtnl_unlock();

if (dev->reg_state == NETREG_UNINITIALIZED) {
err = register_netdev(dev);
if (err) {
Expand All @@ -1971,6 +1968,10 @@ static int xennet_connect(struct net_device *dev)
}
}

rtnl_lock();
netdev_update_features(dev);
rtnl_unlock();

/*
* All public and private state should now be sane. Get
* ready to start sending and receiving packets and give the driver
Expand Down
3 changes: 3 additions & 0 deletions tools/lib/subcmd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ ifneq ($(WERROR),0)
CFLAGS += -Werror
endif

# Don't fail on fallthrough with newer GCCs.
CFLAGS += -Wno-error=implicit-fallthrough

CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE

CFLAGS += -I$(srctree)/tools/include/
Expand Down