Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Atsushi Nemoto and committed by
Ralf Baechle
87d43dd4 c0cf5001

+10 -10
+10 -10
include/asm-mips/mipsregs.h
··· 707 707 */ 708 708 #define __read_64bit_c0_split(source, sel) \ 709 709 ({ \ 710 - unsigned long long val; \ 711 - unsigned long flags; \ 710 + unsigned long long __val; \ 711 + unsigned long __flags; \ 712 712 \ 713 - local_irq_save(flags); \ 713 + local_irq_save(__flags); \ 714 714 if (sel == 0) \ 715 715 __asm__ __volatile__( \ 716 716 ".set\tmips64\n\t" \ ··· 719 719 "dsrl\t%M0, %M0, 32\n\t" \ 720 720 "dsrl\t%L0, %L0, 32\n\t" \ 721 721 ".set\tmips0" \ 722 - : "=r" (val)); \ 722 + : "=r" (__val)); \ 723 723 else \ 724 724 __asm__ __volatile__( \ 725 725 ".set\tmips64\n\t" \ ··· 728 728 "dsrl\t%M0, %M0, 32\n\t" \ 729 729 "dsrl\t%L0, %L0, 32\n\t" \ 730 730 ".set\tmips0" \ 731 - : "=r" (val)); \ 732 - local_irq_restore(flags); \ 731 + : "=r" (__val)); \ 732 + local_irq_restore(__flags); \ 733 733 \ 734 - val; \ 734 + __val; \ 735 735 }) 736 736 737 737 #define __write_64bit_c0_split(source, sel, val) \ 738 738 do { \ 739 - unsigned long flags; \ 739 + unsigned long __flags; \ 740 740 \ 741 - local_irq_save(flags); \ 741 + local_irq_save(__flags); \ 742 742 if (sel == 0) \ 743 743 __asm__ __volatile__( \ 744 744 ".set\tmips64\n\t" \ ··· 759 759 "dmtc0\t%L0, " #source ", " #sel "\n\t" \ 760 760 ".set\tmips0" \ 761 761 : : "r" (val)); \ 762 - local_irq_restore(flags); \ 762 + local_irq_restore(__flags); \ 763 763 } while (0) 764 764 765 765 #define read_c0_index() __read_32bit_c0_register($0, 0)