x86/platform/UV: Prep for UV4 MMR updates

[cascardo/linux.git] / arch / x86 / include / asm / uv / uv_hub.h

diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
index 6660c09..ffbc1c7 100644 (file)
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@ -635,9 +635,14 @@ extern void uv_nmi_setup(void);
 /* Newer SMM NMI handler, not present in all systems */
 #define UVH_NMI_MMRX           UVH_EVENT_OCCURRED0
 #define UVH_NMI_MMRX_CLEAR     UVH_EVENT_OCCURRED0_ALIAS
+
+#ifdef UVH_EVENT_OCCURRED0_EXTIO_INT0_SHFT
+#define UVH_NMI_MMRX_SHIFT     UVH_EVENT_OCCURRED0_EXTIO_INT0_SHFT
+#else
 #define UVH_NMI_MMRX_SHIFT     (is_uv1_hub() ? \
                                        UV1H_EVENT_OCCURRED0_EXTIO_INT0_SHFT :\
                                        UVXH_EVENT_OCCURRED0_EXTIO_INT0_SHFT)
+#endif
 #define        UVH_NMI_MMRX_TYPE       "EXTIO_INT0"
 
 /* Non-zero indicates newer SMM NMI handler present */