diff --git a/drivers/staging/hungtask/hungtask_base.c b/drivers/staging/hungtask/hungtask_base.c
index 30408c0ba1de6cc8374c133d6f434578d5ba5020..3f0d86ddfe57320dc2351f2d9abb2cf087eca43c 100644
--- a/drivers/staging/hungtask/hungtask_base.c
+++ b/drivers/staging/hungtask/hungtask_base.c
@@ -134,14 +134,14 @@ static pid_t get_pid_by_name(const char *name)
 	int pid = 0;
 
 	rcu_read_lock();
-	do_each_thread(g, t) {
+	for_each_process_thread(g, t) {
 		if (rcu_break(&max_count, &batch_count, g, t))
 			goto unlock;
 		if (!strncmp(t->comm, name, TASK_COMM_LEN)) {
 			pid = t->tgid;
 			goto unlock;
 		}
-	} while_each_thread(g, t);
+	}
 
 unlock:
 	rcu_read_unlock();
@@ -176,12 +176,12 @@ static void refresh_appspawn_pids(void)
 	struct task_struct *t = NULL;
 
 	rcu_read_lock();
-	do_each_thread(g, t) {
+	for_each_process_thread(g, t) {
 		if (rcu_break(&max_count, &batch_count, g, t))
 			goto unlock;
 		if (!strncmp(t->comm, "appspawn", TASK_COMM_LEN))
 			appspawn_pid = t->tgid;
-	} while_each_thread(g, t);
+	}
 unlock:
 	rcu_read_unlock();
 }