summaryrefslogtreecommitdiffstats
path: root/mm/page_alloc.c
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2010-10-21 11:39:26 +0200
committerRobert Richter <robert.richter@amd.com>2010-10-21 11:39:26 +0200
commit328b8f1ba50b708a1b3c0acd7c41ee1b356822f6 (patch)
tree819e5cf05bcb160faee1eb546e3471284c9bbaae /mm/page_alloc.c
parent57fa7214330be2e292ddb1402834ff0b221ef29a (diff)
parentf6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff)
downloadlinux-328b8f1ba50b708a1b3c0acd7c41ee1b356822f6.tar.bz2
Merge commit 'v2.6.36' into oprofile/core
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r--mm/page_alloc.c4
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,
if (!table)
panic("Failed to allocate %s hash table\n", tablename);
- printk(KERN_INFO "%s hash table entries: %d (order: %d, %lu bytes)\n",
+ printk(KERN_INFO "%s hash table entries: %ld (order: %d, %lu bytes)\n",
tablename,
- (1U << log2qty),
+ (1UL << log2qty),
ilog2(size) - PAGE_SHIFT,
size);