Skip to content

Commit

Permalink
x86: remove unnecessary save_mr() sanity check
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pekka Enberg authored and Ingo Molnar committed Mar 5, 2009
1 parent 54e63f3 commit 96083ca
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions arch/x86/mm/init_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand Down

0 comments on commit 96083ca

Please sign in to comment.