Merge tag 'ecryptfs-3.9-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / include / asm-generic / cmpxchg-local.h

diff --git a/include/asm-generic/cmpxchg-local.h b/include/asm-generic/cmpxchg-local.h
index 2533fddd34a69d7b1f272895b980c750f39cfdd1..d8d4c898c1bbabbaa1a13387d9818a2331b0ee85 100644 (file)
--- a/include/asm-generic/cmpxchg-local.h
+++ b/include/asm-generic/cmpxchg-local.h
@@ -21,7 +21,7 @@ static inline unsigned long __cmpxchg_local_generic(volatile void *ptr,
        if (size == 8 && sizeof(unsigned long) != 8)
                wrong_size_cmpxchg(ptr);
 
-       local_irq_save(flags);
+       raw_local_irq_save(flags);
        switch (size) {
        case 1: prev = *(u8 *)ptr;
                if (prev == old)
@@ -42,7 +42,7 @@ static inline unsigned long __cmpxchg_local_generic(volatile void *ptr,
        default:
                wrong_size_cmpxchg(ptr);
        }
-       local_irq_restore(flags);
+       raw_local_irq_restore(flags);
        return prev;
 }
 
@@ -55,11 +55,11 @@ static inline u64 __cmpxchg64_local_generic(volatile void *ptr,
        u64 prev;
        unsigned long flags;
 
-       local_irq_save(flags);
+       raw_local_irq_save(flags);
        prev = *(u64 *)ptr;
        if (prev == old)
                *(u64 *)ptr = new;
-       local_irq_restore(flags);
+       raw_local_irq_restore(flags);
        return prev;
 }