From af074657a8ed9ac642b981c299d1d6c60504b7fe Mon Sep 17 00:00:00 2001 From: Thomas Bogendoerfer Date: Tue, 21 Apr 2009 23:31:12 +0200 Subject: [PATCH] --- yaml --- r: 144955 b: refs/heads/master c: 1699e5c9c414f0e3b393eb87c4acfc319fe7a1c4 h: refs/heads/master i: 144953: 044f9668c5aef74ebe6b5b7d358d57cf19a53a93 144951: aae7030488eb8dc708e90dcf9cde0b21f63d0772 v: v3 --- [refs] | 2 +- trunk/arch/mips/include/asm/sn/addrs.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d419b101319c..0b4b75c3cba2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad058e95f943e26205aa916b83b85ccb21bd4812 +refs/heads/master: 1699e5c9c414f0e3b393eb87c4acfc319fe7a1c4 diff --git a/trunk/arch/mips/include/asm/sn/addrs.h b/trunk/arch/mips/include/asm/sn/addrs.h index fec9bdd34913..3a56d90abfa6 100644 --- a/trunk/arch/mips/include/asm/sn/addrs.h +++ b/trunk/arch/mips/include/asm/sn/addrs.h @@ -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