Commit c34e6e8b authored by Kevin D. Kissell's avatar Kevin D. Kissell Committed by Ralf Baechle

MIPS: SMTC: Bring set/clear/change_c0_## return value semantics uptodate.

Signed-off-by: default avatarKevin D. Kissell <kevink@paralogos.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 45d44740
...@@ -1484,14 +1484,15 @@ static inline unsigned int \ ...@@ -1484,14 +1484,15 @@ static inline unsigned int \
set_c0_##name(unsigned int set) \ set_c0_##name(unsigned int set) \
{ \ { \
unsigned int res; \ unsigned int res; \
unsigned int new; \
unsigned int omt; \ unsigned int omt; \
unsigned long flags; \ unsigned long flags; \
\ \
local_irq_save(flags); \ local_irq_save(flags); \
omt = __dmt(); \ omt = __dmt(); \
res = read_c0_##name(); \ res = read_c0_##name(); \
res |= set; \ new = res | set; \
write_c0_##name(res); \ write_c0_##name(new); \
__emt(omt); \ __emt(omt); \
local_irq_restore(flags); \ local_irq_restore(flags); \
\ \
...@@ -1502,14 +1503,15 @@ static inline unsigned int \ ...@@ -1502,14 +1503,15 @@ static inline unsigned int \
clear_c0_##name(unsigned int clear) \ clear_c0_##name(unsigned int clear) \
{ \ { \
unsigned int res; \ unsigned int res; \
unsigned int new; \
unsigned int omt; \ unsigned int omt; \
unsigned long flags; \ unsigned long flags; \
\ \
local_irq_save(flags); \ local_irq_save(flags); \
omt = __dmt(); \ omt = __dmt(); \
res = read_c0_##name(); \ res = read_c0_##name(); \
res &= ~clear; \ new = res & ~clear; \
write_c0_##name(res); \ write_c0_##name(new); \
__emt(omt); \ __emt(omt); \
local_irq_restore(flags); \ local_irq_restore(flags); \
\ \
...@@ -1517,9 +1519,10 @@ clear_c0_##name(unsigned int clear) \ ...@@ -1517,9 +1519,10 @@ clear_c0_##name(unsigned int clear) \
} \ } \
\ \
static inline unsigned int \ static inline unsigned int \
change_c0_##name(unsigned int change, unsigned int new) \ change_c0_##name(unsigned int change, unsigned int newbits) \
{ \ { \
unsigned int res; \ unsigned int res; \
unsigned int new; \
unsigned int omt; \ unsigned int omt; \
unsigned long flags; \ unsigned long flags; \
\ \
...@@ -1527,9 +1530,9 @@ change_c0_##name(unsigned int change, unsigned int new) \ ...@@ -1527,9 +1530,9 @@ change_c0_##name(unsigned int change, unsigned int new) \
\ \
omt = __dmt(); \ omt = __dmt(); \
res = read_c0_##name(); \ res = read_c0_##name(); \
res &= ~change; \ new = res & ~change; \
res |= (new & change); \ new |= (newbits & change); \
write_c0_##name(res); \ write_c0_##name(new); \
__emt(omt); \ __emt(omt); \
local_irq_restore(flags); \ local_irq_restore(flags); \
\ \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment