From e9e593fb965b70f6a3de90e6d61c9cbcbcad6c17 Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Sun, 17 Feb 2013 01:16:15 +0100
Subject: [PATCH] --- yaml --- r: 360111 b: refs/heads/master c:
 535237cecab2b078114be712c67e89a0db61965f h: refs/heads/master i:   360109:
 6fa00448030bc52c56520547f80d8c74504812cf   360107:
 4c5f6e2125167e33dfb7f7387912d5dae5582313   360103:
 e88e576512578913c480b5ca8cec0a6635717a7c   360095:
 b490f988323f841e5af02a6e18107a12f01bf213 v: v3

---
 [refs]                       |  2 +-
 trunk/arch/mips/kernel/vpe.c | 15 +++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 4ccd5efd032e..6e0162dc93d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df1cc3da2134bc10e6edc62709013a10e03e4106
+refs/heads/master: 535237cecab2b078114be712c67e89a0db61965f
diff --git a/trunk/arch/mips/kernel/vpe.c b/trunk/arch/mips/kernel/vpe.c
index 147cec19621d..0e0fdb783b7c 100644
--- a/trunk/arch/mips/kernel/vpe.c
+++ b/trunk/arch/mips/kernel/vpe.c
@@ -697,18 +697,7 @@ static int vpe_run(struct vpe * v)
 	dmt_flag = dmt();
 	vpeflags = dvpe();
 
-	if (!list_empty(&v->tc)) {
-		if ((t = list_entry(v->tc.next, struct tc, tc)) == NULL) {
-			evpe(vpeflags);
-			emt(dmt_flag);
-			local_irq_restore(flags);
-
-			printk(KERN_WARNING
-			       "VPE loader: TC %d is already in use.\n",
-			       v->tc->index);
-			return -ENOEXEC;
-		}
-	} else {
+	if (list_empty(&v->tc)) {
 		evpe(vpeflags);
 		emt(dmt_flag);
 		local_irq_restore(flags);
@@ -720,6 +709,8 @@ static int vpe_run(struct vpe * v)
 		return -ENOEXEC;
 	}
 
+	t = list_first_entry(&v->tc, struct tc, tc);
+
 	/* Put MVPE's into 'configuration state' */
 	set_c0_mvpcontrol(MVPCONTROL_VPC);