git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
include
/
net
/
inet_hashtables.h
diff --git
a/include/net/inet_hashtables.h
b/include/net/inet_hashtables.h
index
cdc08c1
..
8d98dc7
100644
(file)
--- a/
include/net/inet_hashtables.h
+++ b/
include/net/inet_hashtables.h
@@
-183,7
+183,7
@@
static inline int inet_ehash_locks_alloc(struct inet_hashinfo *hashinfo)
size = 2048;
if (nr_pcpus >= 32)
size = 4096;
- if (sizeof(
rw
lock_t) != 0) {
+ if (sizeof(
spin
lock_t) != 0) {
#ifdef CONFIG_NUMA
if (size * sizeof(spinlock_t) > PAGE_SIZE)
hashinfo->ehash_locks = vmalloc(size * sizeof(spinlock_t));