From: Tony Luck Date: Mon, 29 Aug 2005 23:13:36 +0000 (-0700) Subject: [IA64-SGI] One new use of "UNCACHED" needed fixing for sn2 region cleanup X-Git-Tag: v2.6.14-rc1~1019^2~4 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e438befd76a5a743725a89365140a8a7bf276096;p=linux-2.6 [IA64-SGI] One new use of "UNCACHED" needed fixing for sn2 region cleanup Some shub2 changes were not in the tree when Greg cleaned up the sn2 region definitions in 1b66776da71e33dff5edcc0b096ec3b7c40c75ad, so this one didn't get fixed. Signed-off-by: Tony Luck --- diff --git a/include/asm-ia64/sn/addrs.h b/include/asm-ia64/sn/addrs.h index 5b7823d57d..2c32e4b77b 100644 --- a/include/asm-ia64/sn/addrs.h +++ b/include/asm-ia64/sn/addrs.h @@ -258,7 +258,7 @@ /* Shub1 TIO & MMR addressing macros */ #define SH2_TIO_IOSPACE_ADDR(n,x) \ - ((UNCACHED | REMOTE_ADDR(n,x) | 1UL << (NASID_SHIFT - 2))) + ((__IA64_UNCACHED_OFFSET | REMOTE_ADDR(n,x) | 1UL << (NASID_SHIFT - 2))) #define SH2_REMOTE_MMR(n,x) \ GLOBAL_MMR_ADDR(n,x)