MIPS: remove local_irq_[save|restore] from CP0 macros
authorDaniel Schwierzeck <daniel.schwierzeck@gmail.com>
Wed, 19 Dec 2018 14:18:52 +0000 (15:18 +0100)
committerDaniel Schwierzeck <daniel.schwierzeck@gmail.com>
Wed, 19 Dec 2018 14:23:01 +0000 (15:23 +0100)
With moving write_on_tlb() to arch/mips/include/asm/mipsregs.h
there are now compiler warnings when some generic code includes
asm/io.h. This happens for example when enabling OF live tree.

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
arch/mips/include/asm/mipsregs.h

index 48fa1f1..cdd546a 100644 (file)
@@ -1013,9 +1013,7 @@ do {                                                                      \
 #define __read_64bit_c0_split(source, sel)                             \
 ({                                                                     \
        unsigned long long __val;                                       \
-       unsigned long __flags;                                          \
                                                                        \
-       local_irq_save(__flags);                                        \
        if (sel == 0)                                                   \
                __asm__ __volatile__(                                   \
                        ".set\tmips64\n\t"                              \
@@ -1034,16 +1032,12 @@ do {                                                                    \
                        "dsra\t%L0, %L0, 32\n\t"                        \
                        ".set\tmips0"                                   \
                        : "=r" (__val));                                \
-       local_irq_restore(__flags);                                     \
                                                                        \
        __val;                                                          \
 })
 
 #define __write_64bit_c0_split(source, sel, val)                       \
 do {                                                                   \
-       unsigned long __flags;                                          \
-                                                                       \
-       local_irq_save(__flags);                                        \
        if (sel == 0)                                                   \
                __asm__ __volatile__(                                   \
                        ".set\tmips64\n\t"                              \
@@ -1064,7 +1058,6 @@ do {                                                                      \
                        "dmtc0\t%L0, " #source ", " #sel "\n\t"         \
                        ".set\tmips0"                                   \
                        : : "r" (val));                                 \
-       local_irq_restore(__flags);                                     \
 } while (0)
 
 #define __readx_32bit_c0_register(source)                              \