Sync with trunk r58740.

[reactos.git] / drivers / base / nmidebug / nmidebug.c

diff --git a/drivers/base/nmidebug/nmidebug.c b/drivers/base/nmidebug/nmidebug.c
index 9b14785..4aa2791 100644 (file)
--- a/drivers/base/nmidebug/nmidebug.c
+++ b/drivers/base/nmidebug/nmidebug.c
@@ -9,7 +9,7 @@
 /* INCLUDES *******************************************************************/
 
 #include <ntifs.h>
-#include <ntndk.h>
+#include <ndk/ketypes.h>
 
 /* FUNCTIONS ******************************************************************/
 
@@ -21,6 +21,7 @@ NmiClearFlag(VOID)
 {
     ((PCHAR)&KiBugCheckData[4])[0] -= (NmiBegin[3] | NmiBegin[7]);
     ((PCHAR)&KiBugCheckData[4])[3] |= 1;
+#ifdef _M_IX86
 #ifdef _MSC_VER
     __asm
     {
@@ -29,6 +30,7 @@ NmiClearFlag(VOID)
 #else
     __asm__("rcrl %b[shift], %k[retval]" : [retval] "=rm" (KiBugCheckData[4]) : "[retval]" (KiBugCheckData[4]), [shift] "Nc" (8));
 #endif
+#endif
 }
 
 BOOLEAN
@@ -44,7 +46,9 @@ NmiDbgCallback(IN PVOID Context,
     ((void(*)())&KiBugCheckData[4])();
 
     /* Handle the NMI safely */
+#ifdef _M_IX86
     KiEnableTimerWatchdog = (RtlCompareMemory(NmiBegin, NmiBegin + 4, 4) != 4);
+#endif
     return TRUE;
 }