Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87d43dd4 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

[MIPS] Change names of local variables to silence sparse (part 2) 



This patch is an workaround for these sparse warnings:

include2/asm/mmu_context.h:172:2: warning: symbol 'flags' shadows an earlier one
include2/asm/mmu_context.h:133:16: originally declared here
include2/asm/mmu_context.h:232:2: warning: symbol 'flags' shadows an earlier one
include2/asm/mmu_context.h:203:16: originally declared here
include2/asm/mmu_context.h:277:3: warning: symbol 'flags' shadows an earlier one
include2/asm/mmu_context.h:250:16: originally declared here

Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent c0cf5001

include/asm-mips/mipsregs.h

+10 −10
Original line number Diff line number Diff line
@@ -707,10 +707,10 @@ do { \ 
 */

#define __read_64bit_c0_split(source, sel)				\

({									\

	unsigned long long val;						\

	unsigned long flags;						\

	unsigned long long __val;					\

	unsigned long __flags;						\

									\

	local_irq_save(flags);						\

	local_irq_save(__flags);					\

	if (sel == 0)							\

		__asm__ __volatile__(					\

			".set\tmips64\n\t"				\
@@ -719,7 +719,7 @@ do { \ 
			"dsrl\t%M0, %M0, 32\n\t"			\

			"dsrl\t%L0, %L0, 32\n\t"			\

			".set\tmips0"					\

			: "=r" (val));					\

			: "=r" (__val));				\

	else								\

		__asm__ __volatile__(					\

			".set\tmips64\n\t"				\
@@ -728,17 +728,17 @@ do { \ 
			"dsrl\t%M0, %M0, 32\n\t"			\

			"dsrl\t%L0, %L0, 32\n\t"			\

			".set\tmips0"					\

			: "=r" (val));					\

	local_irq_restore(flags);					\

			: "=r" (__val));				\

	local_irq_restore(__flags);					\

									\

	val;								\

	__val;								\

})



#define __write_64bit_c0_split(source, sel, val)			\

do {									\

	unsigned long flags;						\

	unsigned long __flags;						\

									\

	local_irq_save(flags);						\

	local_irq_save(__flags);					\

	if (sel == 0)							\

		__asm__ __volatile__(					\

			".set\tmips64\n\t"				\
@@ -759,7 +759,7 @@ do { \ 
			"dmtc0\t%L0, " #source ", " #sel "\n\t"		\

			".set\tmips0"					\

			: : "r" (val));					\

	local_irq_restore(flags);					\

	local_irq_restore(__flags);					\

} while (0)



#define read_c0_index()		__read_32bit_c0_register($0, 0)