Index: MdeModulePkg/Core/Dxe/Misc/Stall.c
===================================================================
--- MdeModulePkg/Core/Dxe/Misc/Stall.c	(revision 16103)
+++ MdeModulePkg/Core/Dxe/Misc/Stall.c	(working copy)
@@ -65,12 +65,11 @@
 
   //
   // Counter = Microseconds * 10 / gMetronome->TickPeriod
-  // 0x1999999999999999 = (2^64 - 1) / 10
   //
-  if (Microseconds > 0x1999999999999999ULL) {
+  if (Microseconds > (MAX_UINTN / 10)) {
     //
     // Microseconds is too large to multiple by 10 first.  Perform the divide 
-    // operation first and loop 10 times to avoid 64-bit math overflow.
+    // operation first and loop 10 times to avoid UINTN math overflow.
     //
     Counter = DivU64x32Remainder (
                 Microseconds,