Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1699e5c9 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer Committed by Ralf Baechle
Browse files

MIPS: IP27: Fix clash with NMI_OFFSET from hardirq.h 



There was already a define for NMI_OFFSET in asm/sn/addr.h, which now
clashes with linux/hardirq.h. Rename the one in sn/addr.h to fix IP27
builds..

Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent ad058e95

arch/mips/include/asm/sn/addrs.h

+2 −2
Original line number Diff line number Diff line
@@ -359,11 +359,11 @@ 
	TO_NODE_UNCAC((nasid), LAUNCH_OFFSET(nasid, slice))

#define LAUNCH_SIZE(nasid)	KLD_LAUNCH(nasid)->size



#define NMI_OFFSET(nasid, slice)					\

#define SN_NMI_OFFSET(nasid, slice)					\

	(KLD_NMI(nasid)->offset +					\

	 KLD_NMI(nasid)->stride * (slice))

#define NMI_ADDR(nasid, slice)						\

	TO_NODE_UNCAC((nasid), NMI_OFFSET(nasid, slice))

	TO_NODE_UNCAC((nasid), SN_NMI_OFFSET(nasid, slice))

#define NMI_SIZE(nasid)	KLD_NMI(nasid)->size



#define KLCONFIG_OFFSET(nasid)	KLD_KLCONFIG(nasid)->offset