Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 40924
b: refs/heads/master
c: 15803a4
h: refs/heads/master
v: v3
  • Loading branch information
Magnus Damm authored and Andi Kleen committed Nov 14, 2006
1 parent 7669173 commit 6de4f0c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5e58a02a8f6a7a1c9ae41f39286bcd3aea0d6f24
refs/heads/master: 15803a43288da434d34d41c4ed650c3c1728d42c
2 changes: 2 additions & 0 deletions trunk/arch/x86_64/kernel/e820.c
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,9 @@ static int __init parse_memmap_opt(char *p)
* size before original memory map is
* reset.
*/
e820_register_active_regions(0, 0, -1UL);
saved_max_pfn = e820_end_of_ram();
remove_all_active_ranges();
#endif
end_pfn_map = 0;
e820.nr_map = 0;
Expand Down

0 comments on commit 6de4f0c

Please sign in to comment.