Commit eed108ed authored May 23, 2026 by Linus Torvalds

Merge tag 'nios2_updates_for_v7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux

Pull nios2 fixes from Dinh Nguyen:

 - Implement _THIS_IP_ for inline asm

 - Add Simon Schuster as a maintainer and mark the NIOS2 as Supported

* tag 'nios2_updates_for_v7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  nios2: Implement _THIS_IP_ using inline asm
  MAINTAINERS: arch/nios2: Add Simon Schuster as co-maintainer

parents 95e6d3ba e90ef85a

MAINTAINERS

+2 −1

Original line number	Diff line number	Diff line
		@@ -18947,7 +18947,8 @@ F: drivers/hid/hid-nintendo*

		NIOS2 ARCHITECTURE
		M: Dinh Nguyen <dinguyen@kernel.org>
		S: Maintained
		M: Simon Schuster <schuster.simon@siemens-energy.com>
		S: Supported
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
		F: arch/nios2/

arch/nios2/include/asm/linkage.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -12,4 +12,6 @@
		#define __ALIGN .align 4
		#define __ALIGN_STR ".align 4"

		#define _THIS_IP_ ({ unsigned long __ip; asm volatile("nextpc %0" : "=r" (__ip)); __ip; })

		#endif