diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-08 07:21:27 -0400 |
| commit | e635a01ea0a16cf7cd31ecd2305870385dca9be6 (patch) | |
| tree | c7153e7dee5caf6ac90d85694ff27e4d0b606290 /arch/mips/include/asm/sn/addrs.h | |
| parent | 143070e74630b9557e1bb64d899ff2cc5a1dcb48 (diff) | |
| parent | 947391cfbaa3b08558844c0b187bcd0223c3f660 (diff) | |
Merge branch 'next-mtd' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch/mips/include/asm/sn/addrs.h')
| -rw-r--r-- | arch/mips/include/asm/sn/addrs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/include/asm/sn/addrs.h b/arch/mips/include/asm/sn/addrs.h index fec9bdd34913..3a56d90abfa6 100644 --- a/arch/mips/include/asm/sn/addrs.h +++ b/arch/mips/include/asm/sn/addrs.h | |||
| @@ -359,11 +359,11 @@ | |||
| 359 | TO_NODE_UNCAC((nasid), LAUNCH_OFFSET(nasid, slice)) | 359 | TO_NODE_UNCAC((nasid), LAUNCH_OFFSET(nasid, slice)) |
| 360 | #define LAUNCH_SIZE(nasid) KLD_LAUNCH(nasid)->size | 360 | #define LAUNCH_SIZE(nasid) KLD_LAUNCH(nasid)->size |
| 361 | 361 | ||
| 362 | #define NMI_OFFSET(nasid, slice) \ | 362 | #define SN_NMI_OFFSET(nasid, slice) \ |
| 363 | (KLD_NMI(nasid)->offset + \ | 363 | (KLD_NMI(nasid)->offset + \ |
| 364 | KLD_NMI(nasid)->stride * (slice)) | 364 | KLD_NMI(nasid)->stride * (slice)) |
| 365 | #define NMI_ADDR(nasid, slice) \ | 365 | #define NMI_ADDR(nasid, slice) \ |
| 366 | TO_NODE_UNCAC((nasid), NMI_OFFSET(nasid, slice)) | 366 | TO_NODE_UNCAC((nasid), SN_NMI_OFFSET(nasid, slice)) |
| 367 | #define NMI_SIZE(nasid) KLD_NMI(nasid)->size | 367 | #define NMI_SIZE(nasid) KLD_NMI(nasid)->size |
| 368 | 368 | ||
| 369 | #define KLCONFIG_OFFSET(nasid) KLD_KLCONFIG(nasid)->offset | 369 | #define KLCONFIG_OFFSET(nasid) KLD_KLCONFIG(nasid)->offset |