From 6879405cf0775dce461b6d3ceb9cdf353fd9b7a7 Mon Sep 17 00:00:00 2001 From: Tony Luck Date: Mon, 29 Aug 2005 16:13:36 -0700 Subject: [PATCH] --- yaml --- r: 6672 b: refs/heads/master c: e438befd76a5a743725a89365140a8a7bf276096 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-ia64/sn/addrs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0f0ad2133af5..2b7bf441e0c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 329058028523a5b36de449f130111b7671a4f269 +refs/heads/master: e438befd76a5a743725a89365140a8a7bf276096 diff --git a/trunk/include/asm-ia64/sn/addrs.h b/trunk/include/asm-ia64/sn/addrs.h index 5b7823d57d4a..2c32e4b77b54 100644 --- a/trunk/include/asm-ia64/sn/addrs.h +++ b/trunk/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)