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 <tony.luck@intel.com>
 
 /* 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)