diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index d53a24de2..efa1b008c 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +2008-08-29 Andy Grover + + * include/ddk/winddk.h (KeRaiseIrql): Define. + (KfRaiseIrql, KfLowerIrql): remove incorrect definitions. + 2008-08-29 Andy Grover * include/ddk/winddk.h (KeFlushQueuedDpcs, KeMemoryBarrier): Define. diff --git a/winsup/w32api/include/ddk/winddk.h b/winsup/w32api/include/ddk/winddk.h index 9c9a078e2..1af2500af 100644 --- a/winsup/w32api/include/ddk/winddk.h +++ b/winsup/w32api/include/ddk/winddk.h @@ -7726,38 +7726,18 @@ KeWaitForSingleObject( /*IN*/ BOOLEAN Alertable, /*IN*/ PLARGE_INTEGER Timeout /*OPTIONAL*/); -#if defined(_X86_) - NTOSAPI VOID -FASTCALL -KfLowerIrql( - /*IN*/ KIRQL NewIrql); - -NTOSAPI -KIRQL -FASTCALL -KfRaiseIrql( - /*IN*/ KIRQL NewIrql); - -#define KeLowerIrql(a) KfLowerIrql(a) -#define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) - -#else +DDKAPI +KeRaiseIrql( + /*IN*/ KIRQL new_irql, + /*OUT*/ PKIRQL old_irql); NTOSAPI VOID DDKAPI KeLowerIrql( - /*IN*/ KIRQL NewIrql); - -NTOSAPI -KIRQL -DDKAPI -KeRaiseIrql( - /*IN*/ KIRQL NewIrql); - -#endif + /*IN*/ KIRQL irql); NTOSAPI KIRQL