diff options
| author | David S. Miller <davem@davemloft.net> | 2021-10-22 11:41:16 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-22 11:41:16 +0100 |
| commit | bdfa75ad70e93633e18b1ed2b3866c01aa9bf9d2 (patch) | |
| tree | 45115e9c988cbaa49f3766cbe6e6775757cb8c20 /arch/nios2/include/asm/irqflags.h | |
| parent | ab98bbee072c7c30c391ae742b209efebb468273 (diff) | |
| parent | 64222515138e43da1fcf288f0289ef1020427b87 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Lots of simnple overlapping additions.
With a build fix from Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/nios2/include/asm/irqflags.h')
| -rw-r--r-- | arch/nios2/include/asm/irqflags.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/nios2/include/asm/irqflags.h b/arch/nios2/include/asm/irqflags.h index b3ec3e510706..25acf27862f9 100644 --- a/arch/nios2/include/asm/irqflags.h +++ b/arch/nios2/include/asm/irqflags.h @@ -9,7 +9,7 @@ static inline unsigned long arch_local_save_flags(void) { - return RDCTL(CTL_STATUS); + return RDCTL(CTL_FSTATUS); } /* @@ -18,7 +18,7 @@ static inline unsigned long arch_local_save_flags(void) */ static inline void arch_local_irq_restore(unsigned long flags) { - WRCTL(CTL_STATUS, flags); + WRCTL(CTL_FSTATUS, flags); } static inline void arch_local_irq_disable(void) |