diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-30 17:31:07 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-30 17:31:07 -0500 |
| commit | 05bee4737774881e027bfd9a8b5c40a7d68f6325 (patch) | |
| tree | 5fd32eb8fe345d2d30e85910beac241a4439e8cd /include/net/inet_hashtables.h | |
| parent | 80595d59ba9917227856e663da249c2276a8628d (diff) | |
| parent | 905db44087855e3c1709f538ecdc22fd149cadd8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000/e1000_main.c
Diffstat (limited to 'include/net/inet_hashtables.h')
| -rw-r--r-- | include/net/inet_hashtables.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h index cdc08c190638..8d98dc76bd76 100644 --- 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) | |||
| 183 | size = 2048; | 183 | size = 2048; |
| 184 | if (nr_pcpus >= 32) | 184 | if (nr_pcpus >= 32) |
| 185 | size = 4096; | 185 | size = 4096; |
| 186 | if (sizeof(rwlock_t) != 0) { | 186 | if (sizeof(spinlock_t) != 0) { |
| 187 | #ifdef CONFIG_NUMA | 187 | #ifdef CONFIG_NUMA |
| 188 | if (size * sizeof(spinlock_t) > PAGE_SIZE) | 188 | if (size * sizeof(spinlock_t) > PAGE_SIZE) |
| 189 | hashinfo->ehash_locks = vmalloc(size * sizeof(spinlock_t)); | 189 | hashinfo->ehash_locks = vmalloc(size * sizeof(spinlock_t)); |