diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 08:23:04 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 08:23:04 -0400 |
| commit | 5cf4cf65a8ccca44ec9b357ebdb2b517269d7e8a (patch) | |
| tree | beba3ecc27c64e0c22b1a21201f1999afe9834f2 /include/linux/slub_def.h | |
| parent | 55d3ecab2d16be3525ba24a96ba3a67692af1f09 (diff) | |
| parent | b2cd64153b94473f6bd82448a68b8e8c041676ea (diff) | |
Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/
Diffstat (limited to 'include/linux/slub_def.h')
| -rw-r--r-- | include/linux/slub_def.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index fd6627e2d115..c6c1f4a120e3 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h | |||
| @@ -88,7 +88,7 @@ static inline int kmalloc_index(int size) | |||
| 88 | */ | 88 | */ |
| 89 | WARN_ON_ONCE(size == 0); | 89 | WARN_ON_ONCE(size == 0); |
| 90 | 90 | ||
| 91 | if (size >= (1 << KMALLOC_SHIFT_HIGH)) | 91 | if (size > (1 << KMALLOC_SHIFT_HIGH)) |
| 92 | return -1; | 92 | return -1; |
| 93 | 93 | ||
| 94 | if (size > 64 && size <= 96) | 94 | if (size > 64 && size <= 96) |