---

yaml --- r: 356555 b: refs/heads/master c: 9802c8e h: refs/heads/master i: 356553: da8fe48 356551: 40b6879 v: v3
git-mirror · Feb 24, 2013 · f645f6c · f645f6c
1 parent 07d695b
commit f645f6c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -21,6 +21,7 @@
 #include <linux/vmalloc.h>
 #include <linux/export.h>
 #include <linux/jiffies.h>
+#include <linux/pm_runtime.h>
 
 #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;
 }