Commit 1e599774 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nios2_fixes_for_v5.15_part2' of... 

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
parents 0afe64be 4cce60f1

arch/nios2/include/asm/irqflags.h

+2 −2
Original line number Diff line number Diff line
@@ -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)

arch/nios2/include/asm/registers.h

+1 −1
Original line number Diff line number Diff line
@@ -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