MIPS: remove broken conditional inside vpe loader code (535237ce) · Commits · 戴 / test

The commit [1] breaks builds and results in the following error arch/mips/kernel/vpe.c: In function 'vpe_run': arch/mips/kernel/vpe.c:708:16: error: invalid type argument of '->' (have 'struct list_head') Taking a closer look at the conditional we notice that list_first_entry wont ever return NULL. The easiest fix is to just drop the dead code. [1] commit MIPS: vpe.c: Fix null pointer dereference in print arguments. Signed-off-by:

John Crispin <blogic@openwrt.org>

arch/mips/kernel/vpe.c

+3 −12

Original line number	Diff line number	Diff line
		@@ -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);

Admin message