MIPS: tlbex: Fix build error in R3000 code. (d954ffe3) · Commits · 戴 / test

Only some GCC versions such as gcc 4.2 notice that the variable wr in build_r3000_tlb_modify_handler is used uninitialized. When using one of those GCCs the build will fail due to -Werror. GCC 4.6 does not warn about the uninitialized use of wr. This issue was introduced by 7211f4d7a3dcbe57c5d396c334dca525315dceb2 [MIPS: Close races in TLB modify handlers.] Reported-by:

Ganesan Ramalingam <ganesan18@gmail.com> Signed-off-by:

Ralf Baechle <ralf@linux-mips.org>

arch/mips/mm/tlbex.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1759,14 +1759,13 @@ static void __cpuinit build_r3000_tlb_modify_handler(void)
		u32 *p = handle_tlbm;
		struct uasm_label *l = labels;
		struct uasm_reloc *r = relocs;
		struct work_registers wr;

		memset(handle_tlbm, 0, sizeof(handle_tlbm));
		memset(labels, 0, sizeof(labels));
		memset(relocs, 0, sizeof(relocs));

		build_r3000_tlbchange_handler_head(&p, K0, K1);
		build_pte_modifiable(&p, &r, wr.r1, wr.r2, wr.r3, label_nopage_tlbm);
		build_pte_modifiable(&p, &r, K0, K1, -1, label_nopage_tlbm);
		uasm_i_nop(&p); /* load delay */
		build_make_write(&p, &r, K0, K1);
		build_r3000_pte_reload_tlbwi(&p, K0, K1);

Admin message