summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2009-03-05 14:54:57 +0200
committerIngo Molnar <mingo@elte.hu>2009-03-05 14:17:13 +0100
commit96083ca11bc85265c7ef9e791a57e3514d8f605a (patch)
tree212b9549b62465687bae7ea6d83b3597b74a9551
parent54e63f3a4282a8bc5b39db29095f076ece2b1073 (diff)
downloadblackbird-op-linux-96083ca11bc85265c7ef9e791a57e3514d8f605a.tar.gz
blackbird-op-linux-96083ca11bc85265c7ef9e791a57e3514d8f605a.zip
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@cs.helsinki.fi> Cc: Yinghai Lu <yinghai@kernel.org> LKML-Reference: <1236257708-27269-6-git-send-email-penberg@cs.helsinki.fi> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/mm/init_32.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index eb98cb90cb39..559715b488bb 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++) {
OpenPOWER on IntegriCloud