Commit 8a4a10ae996b67c622b9f3f6a4dfea5de4500a11

Authored by Kumar Gala
Committed by Paul Mackerras
1 parent 3f58542f47

[PATCH] powerpc: merge include/asm-ppc*/spinlock_types.h into include/asm-powerpc/spinlock_types.h

Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Showing 3 changed files with 20 additions and 40 deletions Inline Diff

include/asm-powerpc/spinlock_types.h
File was created 1 #ifndef _ASM_POWERPC_SPINLOCK_TYPES_H
2 #define _ASM_POWERPC_SPINLOCK_TYPES_H
3
4 #ifndef __LINUX_SPINLOCK_TYPES_H
5 # error "please don't include this file directly"
6 #endif
7
8 typedef struct {
9 volatile unsigned int slock;
10 } raw_spinlock_t;
11
12 #define __RAW_SPIN_LOCK_UNLOCKED { 0 }
13
14 typedef struct {
15 volatile signed int lock;
16 } raw_rwlock_t;
17
18 #define __RAW_RW_LOCK_UNLOCKED { 0 }
19
20 #endif
21
include/asm-ppc/spinlock_types.h
1 #ifndef __ASM_SPINLOCK_TYPES_H File was deleted
2 #define __ASM_SPINLOCK_TYPES_H
3
4 #ifndef __LINUX_SPINLOCK_TYPES_H
5 # error "please don't include this file directly"
6 #endif
7
8 typedef struct {
9 volatile unsigned long lock;
10 } raw_spinlock_t;
11
12 #define __RAW_SPIN_LOCK_UNLOCKED { 0 }
13
14 typedef struct {
15 volatile signed int lock;
16 } raw_rwlock_t;
17
18 #define __RAW_RW_LOCK_UNLOCKED { 0 }
19
20 #endif
21 1 #ifndef __ASM_SPINLOCK_TYPES_H
include/asm-ppc64/spinlock_types.h
1 #ifndef __ASM_SPINLOCK_TYPES_H File was deleted
2 #define __ASM_SPINLOCK_TYPES_H
3
4 #ifndef __LINUX_SPINLOCK_TYPES_H
5 # error "please don't include this file directly"
6 #endif
7
8 typedef struct {
9 volatile unsigned int slock;
10 } raw_spinlock_t;
11
12 #define __RAW_SPIN_LOCK_UNLOCKED { 0 }
13
14 typedef struct {
15 volatile signed int lock;
16 } raw_rwlock_t;
17
18 #define __RAW_RW_LOCK_UNLOCKED { 0 }
19
20 #endif
21 1 #ifndef __ASM_SPINLOCK_TYPES_H