From e4cd39e255d319f578a18aa1deb6b61d9b58092c Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sun, 2 Jun 2013 18:01:00 +0000 Subject: [PATCH] [RTL] - Fix a format specifier [NTOSKRNL] - Add a missing compiler memory barrier to KeIpiGenericCall - Remove a pointless cast svn path=/trunk/; revision=59147 --- reactos/lib/rtl/image.c | 3 ++- reactos/ntoskrnl/ke/ipi.c | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/reactos/lib/rtl/image.c b/reactos/lib/rtl/image.c index d1fdeca2f97..97e8ee86ec8 100644 --- a/reactos/lib/rtl/image.c +++ b/reactos/lib/rtl/image.c @@ -417,7 +417,8 @@ LdrProcessRelocationBlockLongLong( case IMAGE_REL_BASED_MIPS_JMPADDR: default: DPRINT1("Unknown/unsupported fixup type %hu.\n", Type); - DPRINT1("Address %x, Current %u, Count %u, *TypeOffset %x\n", Address, i, Count, SWAPW(*TypeOffset)); + DPRINT1("Address %p, Current %u, Count %u, *TypeOffset %x\n", + (PVOID)Address, i, Count, SWAPW(*TypeOffset)); return (PIMAGE_BASE_RELOCATION)NULL; } diff --git a/reactos/ntoskrnl/ke/ipi.c b/reactos/ntoskrnl/ke/ipi.c index 1b9bb0c8b69..2778658c1f1 100644 --- a/reactos/ntoskrnl/ke/ipi.c +++ b/reactos/ntoskrnl/ke/ipi.c @@ -228,7 +228,11 @@ KeIpiGenericCall(IN PKIPI_BROADCAST_WORKER Function, &Count); /* Spin until the other processors are ready */ - while ((volatile ULONG)Count != 1) YieldProcessor(); + while (Count != 1) + { + YieldProcessor(); + KeMemoryBarrierWithoutFence(); + } } #endif @@ -248,7 +252,7 @@ KeIpiGenericCall(IN PKIPI_BROADCAST_WORKER Function, if (Affinity) { /* Sanity check */ - ASSERT(Prcb == (volatile PKPRCB)KeGetCurrentPrcb()); + ASSERT(Prcb == KeGetCurrentPrcb()); /* FIXME: TODO */ ASSERTMSG("Not yet implemented\n", FALSE);