From abdde5770eab885f40175442181280cbec6dd4a4 Mon Sep 17 00:00:00 2001 From: Colin Ngam Date: Mon, 25 Apr 2005 13:07:00 -0700 Subject: [PATCH] --- yaml --- r: 505 b: refs/heads/master c: 658b32cad9ae087bd34f35a925fd75b76d663d4e h: refs/heads/master i: 503: 206e09a53fe7a5fbf711287661fcd50ea75a089f v: v3 --- [refs] | 2 +- trunk/include/asm-ia64/sn/addrs.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9a8b04b54e32..932c5e59ac85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be539c73b54dcc9f54fb2c2b70e204c93b616c9b +refs/heads/master: 658b32cad9ae087bd34f35a925fd75b76d663d4e diff --git a/trunk/include/asm-ia64/sn/addrs.h b/trunk/include/asm-ia64/sn/addrs.h index c916bd22767a..ae0bc99d573e 100644 --- a/trunk/include/asm-ia64/sn/addrs.h +++ b/trunk/include/asm-ia64/sn/addrs.h @@ -154,8 +154,9 @@ * the chiplet id is zero. If we implement TIO-TIO dma, we might need * to insert a chiplet id into this macro. However, it is our belief * right now that this chiplet id will be ICE, which is also zero. + * Nasid starts on bit 40. */ -#define PHYS_TO_TIODMA(x) ( (((u64)(x) & NASID_MASK) << 2) | NODE_OFFSET(x)) +#define PHYS_TO_TIODMA(x) ( (((u64)(NASID_GET(x))) << 40) | NODE_OFFSET(x)) #define PHYS_TO_DMA(x) ( (((u64)(x) & NASID_MASK) >> 2) | NODE_OFFSET(x))