2 files changed, 10 insertions, 10 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index b793e3521a36..c5a9d73147a6 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -7196,11 +7196,10 @@ static void __net_exit rtnl_lock_unregistering(struct list_head *net_list)
          */
         struct net *net;
         bool unregistering;
-        DEFINE_WAIT(wait);
+        DEFINE_WAIT_FUNC(wait, woken_wake_function);
 
+        add_wait_queue(&netdev_unregistering_wq, &wait);
         for (;;) {
-                prepare_to_wait(&netdev_unregistering_wq, &wait,
-                                TASK_UNINTERRUPTIBLE);
                 unregistering = false;
                 rtnl_lock();
                 list_for_each_entry(net, net_list, exit_list) {
@@ -7212,9 +7211,10 @@ static void __net_exit rtnl_lock_unregistering(struct list_head *net_list)
                 if (!unregistering)
                         break;
                 __rtnl_unlock();
-                schedule();
+
+                wait_woken(&wait, TASK_UNINTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);
         }
-        finish_wait(&netdev_unregistering_wq, &wait);
+        remove_wait_queue(&netdev_unregistering_wq, &wait);
 }
 
 static void __net_exit default_device_exit_batch(struct list_head *net_list)
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index a6882686ca3a..b095296f711f 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -365,11 +365,10 @@ static void rtnl_lock_unregistering_all(void)
 {
         struct net *net;
         bool unregistering;
-        DEFINE_WAIT(wait);
+        DEFINE_WAIT_FUNC(wait, woken_wake_function);
 
+        add_wait_queue(&netdev_unregistering_wq, &wait);
         for (;;) {
-                prepare_to_wait(&netdev_unregistering_wq, &wait,
-                                TASK_UNINTERRUPTIBLE);
                 unregistering = false;
                 rtnl_lock();
                 for_each_net(net) {
@@ -381,9 +380,10 @@ static void rtnl_lock_unregistering_all(void)
                 if (!unregistering)
                         break;
                 __rtnl_unlock();
-                schedule();
+
+                wait_woken(&wait, TASK_UNINTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT);
         }
-        finish_wait(&netdev_unregistering_wq, &wait);
+        remove_wait_queue(&netdev_unregistering_wq, &wait);
 }
 
 /**