summaryrefslogtreecommitdiff
path: root/mm/page_alloc.c
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2010-10-15 12:04:05 -0700
committerColin Cross <ccross@android.com>2010-10-15 12:04:05 -0700
commit9ab3d8b9fcc83cb2eab5cc9834b742d437915a2e (patch)
tree0a4dc68f031cba95cd36ededfb9b30de60fe1145 /mm/page_alloc.c
parentc8b43bb8ec47fc7e75f4474b454d459a22d9f233 (diff)
parent89c37cce1c850fe046df50ccb923a8eccbf259b6 (diff)
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
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 d0e56c880154..84bc60749f93 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5197,9 +5197,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);