From a8611cc202e7a09158b76cd53f9af6b98fd0552e Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Thu, 5 Mar 2009 14:54:57 +0200 Subject: [PATCH] --- yaml --- r: 138669 b: refs/heads/master c: 96083ca11bc85265c7ef9e791a57e3514d8f605a h: refs/heads/master i: 138667: cbfdf482675c1bc8738f5c71eda5fb8e93fb1e89 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/init_32.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e1d36440767a..582990b12000 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54e63f3a4282a8bc5b39db29095f076ece2b1073 +refs/heads/master: 96083ca11bc85265c7ef9e791a57e3514d8f605a diff --git a/trunk/arch/x86/mm/init_32.c b/trunk/arch/x86/mm/init_32.c index eb98cb90cb39..559715b488bb 100644 --- a/trunk/arch/x86/mm/init_32.c +++ b/trunk/arch/x86/mm/init_32.c @@ -1008,8 +1008,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, /* tail is not big page (2M) alignment */ start_pfn = pos>>PAGE_SHIFT; end_pfn = end>>PAGE_SHIFT; - if (start_pfn < end_pfn) - nr_range = save_mr(mr, nr_range, start_pfn, end_pfn, 0); + nr_range = save_mr(mr, nr_range, start_pfn, end_pfn, 0); /* try to merge same page size and continuous */ for (i = 0; nr_range > 1 && i < nr_range - 1; i++) {