diff options
author | 2013-11-12 10:58:59 +0000 | |
---|---|---|
committer | 2013-11-12 10:58:59 +0000 | |
commit | df762eccbadf87850fbee444d729e0f1b1e946f1 (patch) | |
tree | 1bf47bbbd4ea91e343f983b3b50ec2ec73a739e1 /arch/arm/include/asm/spinlock_types.h | |
parent | Merge branch 'misc' into for-next (diff) | |
parent | ARM: 7878/1: nommu: Implement dummy early_paging_init() (diff) | |
download | linux-dev-df762eccbadf87850fbee444d729e0f1b1e946f1.tar.xz linux-dev-df762eccbadf87850fbee444d729e0f1b1e946f1.zip |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/include/asm/atomic.h
arch/arm/include/asm/hardirq.h
arch/arm/kernel/smp.c
Diffstat (limited to 'arch/arm/include/asm/spinlock_types.h')
-rw-r--r-- | arch/arm/include/asm/spinlock_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/spinlock_types.h b/arch/arm/include/asm/spinlock_types.h index b262d2f8b478..47663fcb10ad 100644 --- a/arch/arm/include/asm/spinlock_types.h +++ b/arch/arm/include/asm/spinlock_types.h @@ -25,7 +25,7 @@ typedef struct { #define __ARCH_SPIN_LOCK_UNLOCKED { { 0 } } typedef struct { - volatile unsigned int lock; + u32 lock; } arch_rwlock_t; #define __ARCH_RW_LOCK_UNLOCKED { 0 } |