patch-2.2.0-pre1 linux/arch/i386/kernel/mtrr.c

• Lines: 24
• Date: Sun Dec 27 22:45:13 1998
• Orig file: v2.1.132/linux/arch/i386/kernel/mtrr.c
• Orig date: Mon Oct 5 13:13:35 1998

diff -u --recursive --new-file v2.1.132/linux/arch/i386/kernel/mtrr.c linux/arch/i386/kernel/mtrr.c
@@ -164,6 +164,9 @@
 #include <asm/bitops.h>
 #include <asm/atomic.h>
 
+#include <asm/hardirq.h>
+#include "irq.h"
+
 #define MTRR_VERSION            "1.26 (19981001)"
 
 #define TRUE  1
@@ -612,10 +615,11 @@
     /*  Send a message to all other CPUs and wait for them to enter the
 	barrier  */
     atomic_set (&undone_count, smp_num_cpus - 1);
-    smp_message_pass (MSG_ALL_BUT_SELF, MSG_MTRR_CHANGE, 0, 0);
+    smp_send_mtrr();
     /*  Wait for it to be done  */
     timeout = jiffies + JIFFIE_TIMEOUT;
-    while ( (atomic_read (&undone_count) > 0) && (jiffies < timeout) )
+    while ( (atomic_read (&undone_count) > 0) &&
+	    time_before(jiffies, timeout) )
 	barrier ();
     if (atomic_read (&undone_count) > 0)
     {