summaryrefslogtreecommitdiffstats
path: root/mm/page_alloc.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-10-11 17:05:11 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-10-11 17:05:11 -0700
commit8e4029ee3517084ae00fbfbcb51cc365d8857061 (patch)
tree3d86578dc6160781a0c2fdad461e5195e73bfafc /mm/page_alloc.c
parentcd79481d27b9f90aad80c9b972292c42c25bbf8e (diff)
parent73cf624d029d776a33d0a80c695485b3f9b36231 (diff)
downloadop-kernel-dev-8e4029ee3517084ae00fbfbcb51cc365d8857061.zip
op-kernel-dev-8e4029ee3517084ae00fbfbcb51cc365d8857061.tar.gz
Merge branch 'x86/urgent' into core/memblock
Reason for merge: Forward-port urgent change to arch/x86/mm/srat_64.c to the memblock tree. Resolved Conflicts: arch/x86/mm/srat_64.c Originally-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
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 9536017..2a362c5 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5198,9 +5198,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);
OpenPOWER on IntegriCloud