use the correct version of KeGetCurrentIrql for MP Modified: trunk/reactos/hal/halx86/mp/mpsirql.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h _____
Modified: trunk/reactos/hal/halx86/mp/mpsirql.c --- trunk/reactos/hal/halx86/mp/mpsirql.c 2005-04-15 06:24:35 UTC (rev 14625) +++ trunk/reactos/hal/halx86/mp/mpsirql.c 2005-04-15 10:52:29 UTC (rev 14626) @@ -29,6 +29,7 @@
/* FUNCTIONS ****************************************************************/
+#undef KeGetCurrentIrql KIRQL STDCALL KeGetCurrentIrql (VOID) /* * PURPOSE: Returns the current irq level @@ -55,6 +56,7 @@ }
+#undef KeSetCurrentIrql VOID KeSetCurrentIrql (KIRQL NewIrql) /* * PURPOSE: Sets the current irq level without taking any action _____
Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-04-15 06:24:35 UTC (rev 14625) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-04-15 10:52:29 UTC (rev 14626) @@ -203,10 +203,9 @@
#define LOCK "lock ; " #else #define LOCK "" +#define KeGetCurrentIrql(X) (((PKPCR)KPCR_BASE)->Irql) #endif
-#define KeGetCurrentIrql(X) (((PKPCR)KPCR_BASE)->Irql) - #if defined(__GNUC__) #define Ke386DisableInterrupts() __asm__("cli\n\t"); #define Ke386EnableInterrupts() __asm__("sti\n\t");