apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into percpu

Browse Source 
Conflicts:
	arch/powerpc/platforms/pseries/hvCall.S
	include/linux/percpu.h
This commit is contained in:
Tejun Heo
2010-01-05 09:17:33 +09:00
parent 22b737f4c7 c5974b835a
commit 32032df6c2
10112 changed files with 878730 additions and 447115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/parisc/lib/bitops.c
+2 -2
View File
@@ -12,8 +12,8 @@
#include <asm/atomic.h>
#ifdef CONFIG_SMP
raw_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned = {
[0 ... (ATOMIC_HASH_SIZE-1)] = __RAW_SPIN_LOCK_UNLOCKED
arch_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned = {
[0 ... (ATOMIC_HASH_SIZE-1)] = __ARCH_SPIN_LOCK_UNLOCKED
};
#endif