From c3b1cdcb406a6c5b79aa7af7b2a2e4e4d2a1e4c4 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Fri, 8 May 2009 00:37:34 -0700 Subject: [PATCH] --- yaml --- r: 145779 b: refs/heads/master c: 0964b0562bb9c93194e852b47bab2397b9e11c18 h: refs/heads/master i: 145777: 674766969bbd3569cdf684d94bd4283d9190ce60 145775: 395f8adfab4a00db22d5a600fba6d77ef85a452b v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/srat_64.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3f0c84090b2b..ad6b7ca31130 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b37ab91907e9002925f4217e3bbd496aa12c2fa3 +refs/heads/master: 0964b0562bb9c93194e852b47bab2397b9e11c18 diff --git a/trunk/arch/x86/mm/srat_64.c b/trunk/arch/x86/mm/srat_64.c index c7a18aaccf8d..87b45bff250d 100644 --- a/trunk/arch/x86/mm/srat_64.c +++ b/trunk/arch/x86/mm/srat_64.c @@ -346,8 +346,8 @@ static int __init nodes_cover_memory(const struct bootnode *nodes) } e820ram = max_pfn - (e820_hole_size(0, max_pfn<>PAGE_SHIFT); - /* We seem to lose 3 pages somewhere. Allow a bit of slack. */ - if ((long)(e820ram - pxmram) >= 1*1024*1024) { + /* We seem to lose 3 pages somewhere. Allow 1M of slack. */ + if ((long)(e820ram - pxmram) >= (1<<(20 - PAGE_SHIFT))) { printk(KERN_ERR "SRAT: PXMs only cover %luMB of your %luMB e820 RAM. Not used.\n", (pxmram << PAGE_SHIFT) >> 20,