diff --git a/[refs] b/[refs] index 56a0ad1244bb..7888383c92cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25e823c8c37d123b77ce12a042da889e6bb5f9d1 +refs/heads/master: 9802c8e22f6efd372e83d9d5d5ff43f3562cfe19 diff --git a/trunk/net/core/net-sysfs.c b/trunk/net/core/net-sysfs.c index a5b89a6fec6d..7427ab5e27d8 100644 --- a/trunk/net/core/net-sysfs.c +++ b/trunk/net/core/net-sysfs.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "net-sysfs.h" @@ -1257,6 +1258,8 @@ void netdev_unregister_kobject(struct net_device * net) remove_queue_kobjects(net); + pm_runtime_set_memalloc_noio(dev, false); + device_del(dev); } @@ -1301,6 +1304,8 @@ int netdev_register_kobject(struct net_device *net) return error; } + pm_runtime_set_memalloc_noio(dev, true); + return error; }