diff options
| author | Linus Torvalds | 2021-10-20 05:56:51 -1000 |
|---|---|---|
| committer | Linus Torvalds | 2021-10-20 05:56:51 -1000 |
| commit | 1e59977463e9894e3d579d4e1e2a1dc81f456633 (patch) | |
| tree | 1c525ed663ff80bb8ddc3653274ff28b7ef475ac | |
| parent | 0afe64bebb13509ef9a4be9deb18286b4c052c93 (diff) | |
| parent | 4cce60f15c04d69eff6ffc539ab09137dbe15070 (diff) | |
Merge tag 'nios2_fixes_for_v5.15_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux
Pull nios2 fix from Dinh Nguyen:
- Renamed CTL_STATUS to CTL_FSTATUS to fix a redefined warning
* tag 'nios2_fixes_for_v5.15_part2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
NIOS2: irqflags: rename a redefined register name
| -rw-r--r-- | arch/nios2/include/asm/irqflags.h | 4 | ||||
| -rw-r--r-- | arch/nios2/include/asm/registers.h | 2 |
2 files changed, 3 insertions, 3 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) diff --git a/arch/nios2/include/asm/registers.h b/arch/nios2/include/asm/registers.h index 183c720e454d..95b67dd16f81 100644 --- a/arch/nios2/include/asm/registers.h +++ b/arch/nios2/include/asm/registers.h @@ -11,7 +11,7 @@ #endif /* control register numbers */ -#define CTL_STATUS 0 +#define CTL_FSTATUS 0 #define CTL_ESTATUS 1 #define CTL_BSTATUS 2 #define CTL_IENABLE 3 |