[PATCH] CRIS: turn local_save_flags() + local_irq_disable() into local_irq_save(...
[sfrench/cifs-2.6.git] / include / asm-cris / system.h
index b869f6161aaa1c73e770fb2f238eecc7894654d9..fea0e8d57cb51883f5d0c31202ef33ed089f863d 100644 (file)
@@ -44,8 +44,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int siz
   /* since Etrax doesn't have any atomic xchg instructions, we need to disable
      irq's (if enabled) and do it with move.d's */
   unsigned long flags,temp;
-  local_save_flags(flags); /* save flags, including irq enable bit */
-  local_irq_disable();             /* shut off irq's */
+  local_irq_save(flags); /* save flags, including irq enable bit and shut off irqs */
   switch (size) {
   case 1:
     *((unsigned char *)&temp) = x;