Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 138669
b: refs/heads/master
c: 96083ca
h: refs/heads/master
i:
  138667: cbfdf48
v: v3
  • Loading branch information
Pekka Enberg authored and Ingo Molnar committed Mar 5, 2009
1 parent ae11453 commit a8611cc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 54e63f3a4282a8bc5b39db29095f076ece2b1073
refs/heads/master: 96083ca11bc85265c7ef9e791a57e3514d8f605a
3 changes: 1 addition & 2 deletions trunk/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 a8611cc

Please sign in to comment.