Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 264408
b: refs/heads/master
c: 8548c84
h: refs/heads/master
v: v3
  • Loading branch information
Takashi Iwai authored and Linus Torvalds committed Oct 24, 2011
1 parent 8d82fcd commit 2fccfd7
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: 1bf1aacedcda23c75e70fa3394e1caa6d4b5ee49
refs/heads/master: 8548c84da2f47e71bbbe300f55edb768492575f7
3 changes: 1 addition & 2 deletions trunk/arch/x86/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,8 @@ static void __init find_early_table_space(unsigned long end, int use_pse,
#ifdef CONFIG_X86_32
/* for fixmap */
tables += roundup(__end_of_fixed_addresses * sizeof(pte_t), PAGE_SIZE);

good_end = max_pfn_mapped << PAGE_SHIFT;
#endif
good_end = max_pfn_mapped << PAGE_SHIFT;

base = memblock_find_in_range(start, good_end, tables, PAGE_SIZE);
if (base == MEMBLOCK_ERROR)
Expand Down

0 comments on commit 2fccfd7

Please sign in to comment.