[tip:x86/mm] x86: remove unnecessary save_mr() sanity check

From: Pekka Enberg
Date: Thu Mar 05 2009 - 08:39:45 EST


Commit-ID: 96083ca11bc85265c7ef9e791a57e3514d8f605a
Gitweb: http://git.kernel.org/tip/96083ca11bc85265c7ef9e791a57e3514d8f605a
Author: "Pekka Enberg" <penberg@xxxxxxxxxxxxxx>
AuthorDate: Thu, 5 Mar 2009 14:54:57 +0200
Commit: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Thu, 5 Mar 2009 14:17:13 +0100

x86: remove unnecessary save_mr() sanity check

Impact: cleanup

The save_mr() function already checks that start_pfn is less than
end_pfn so we can remove the unnecessary check which reduces the
diff between the 32-bit and the 64-bit versions of init_memory_mapping().

Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
LKML-Reference: <1236257708-27269-6-git-send-email-penberg@xxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>


---
arch/x86/mm/init_32.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index eb98cb9..559715b 100644
--- a/arch/x86/mm/init_32.c
+++ b/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++) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/