diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
| commit | e548833df83c3554229eff0672900bfe958b45fd (patch) | |
| tree | 85efc4a76dc356593d6d394776aeb845dc580fb6 /arch/sparc/include/asm/rwsem-const.h | |
| parent | cbd9da7be869f676afc204e1a664163778c770bd (diff) | |
| parent | 053d8f6622701f849fda2ca2c9ae596c13599ba9 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/main.c
Diffstat (limited to 'arch/sparc/include/asm/rwsem-const.h')
| -rw-r--r-- | arch/sparc/include/asm/rwsem-const.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/sparc/include/asm/rwsem-const.h b/arch/sparc/include/asm/rwsem-const.h deleted file mode 100644 index a303c9d64d8..00000000000 --- a/arch/sparc/include/asm/rwsem-const.h +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | /* rwsem-const.h: RW semaphore counter constants. */ | ||
| 2 | #ifndef _SPARC64_RWSEM_CONST_H | ||
| 3 | #define _SPARC64_RWSEM_CONST_H | ||
| 4 | |||
| 5 | #define RWSEM_UNLOCKED_VALUE 0x00000000 | ||
| 6 | #define RWSEM_ACTIVE_BIAS 0x00000001 | ||
| 7 | #define RWSEM_ACTIVE_MASK 0x0000ffff | ||
| 8 | #define RWSEM_WAITING_BIAS 0xffff0000 | ||
| 9 | #define RWSEM_ACTIVE_READ_BIAS RWSEM_ACTIVE_BIAS | ||
| 10 | #define RWSEM_ACTIVE_WRITE_BIAS (RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS) | ||
| 11 | |||
| 12 | #endif /* _SPARC64_RWSEM_CONST_H */ | ||