MIPS fixes based on suggestions from Jiang.

[openvswitch] / datapath / linux-2.4 / compat-2.4 / include-mips / asm / system.h

diff --git a/datapath/linux-2.4/compat-2.4/include-mips/asm/system.h b/datapath/linux-2.4/compat-2.4/include-mips/asm/system.h
index c1b081540cebd1be911d329d7e1c7d39815f08d9..815b8530b2b097224412640a9ab4de17361350cb 100644 (file)
--- a/datapath/linux-2.4/compat-2.4/include-mips/asm/system.h
+++ b/datapath/linux-2.4/compat-2.4/include-mips/asm/system.h
@@ -3,8 +3,6 @@
 
 #include_next <asm/system.h>
 
-#error "Cribbed from linux-2.6/include/asm-mips/system.h but untested."
-
 #define __HAVE_ARCH_CMPXCHG 1
 
 static inline unsigned long __cmpxchg_u32(volatile int * m, unsigned long old,
@@ -52,11 +50,11 @@ static inline unsigned long __cmpxchg_u32(volatile int * m, unsigned long old,
        } else {
                unsigned long flags;
 
-               raw_local_irq_save(flags);
+               local_irq_save(flags);
                retval = *m;
                if (retval == old)
                        *m = new;
-               raw_local_irq_restore(flags);   /* implies memory barrier  */
+               local_irq_restore(flags);       /* implies memory barrier  */
        }
 
        smp_llsc_mb();
@@ -158,11 +156,11 @@ static inline unsigned long __cmpxchg_u64(volatile int * m, unsigned long old,
        } else {
                unsigned long flags;
 
-               raw_local_irq_save(flags);
+               local_irq_save(flags);
                retval = *m;
                if (retval == old)
                        *m = new;
-               raw_local_irq_restore(flags);   /* implies memory barrier  */
+               local_irq_restore(flags);       /* implies memory barrier  */
        }
 
        smp_llsc_mb();