diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-10-18 11:25:09 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-10-18 11:25:09 -0400 |
| commit | db181a8ee158fd0ccea2e2670c4f2d36af2814a0 (patch) | |
| tree | d03adc3926b4aca7ee172d825b90fe965b4f01b9 /mm/page_alloc.c | |
| parent | ee2007d299ad4020115b193858817e6c57e95db5 (diff) | |
| parent | 9c0a788b4315b83f6138ffa15c56ccf541106e58 (diff) | |
Merge branch 'for-spi' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin into spi/next
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index a8cfa9cc6e86..f12ad1836abe 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -5182,9 +5182,9 @@ void *__init alloc_large_system_hash(const char *tablename, | |||
| 5182 | if (!table) | 5182 | if (!table) |
| 5183 | panic("Failed to allocate %s hash table\n", tablename); | 5183 | panic("Failed to allocate %s hash table\n", tablename); |
| 5184 | 5184 | ||
| 5185 | printk(KERN_INFO "%s hash table entries: %d (order: %d, %lu bytes)\n", | 5185 | printk(KERN_INFO "%s hash table entries: %ld (order: %d, %lu bytes)\n", |
| 5186 | tablename, | 5186 | tablename, |
| 5187 | (1U << log2qty), | 5187 | (1UL << log2qty), |
| 5188 | ilog2(size) - PAGE_SHIFT, | 5188 | ilog2(size) - PAGE_SHIFT, |
| 5189 | size); | 5189 | size); |
| 5190 | 5190 | ||