diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-10-26 13:48:49 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-10-26 13:48:49 -0700 |
| commit | 2216773fc021964a413409141d439de4f6a108f7 (patch) | |
| tree | 7b2f8cdcdf5fb05d75bd92f0c8d9ac635ceec48c /arch/x86/mm/init.c | |
| parent | 42ac8ca89aef66618e8ae2d6e48e3f523bfcd69d (diff) | |
| parent | af1bdb79ca64ceadc7b44b11929b384eff66ce59 (diff) | |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebaselinux-linaro-3.1-2011.10-2-android-0
Diffstat (limited to 'arch/x86/mm/init.c')
| -rw-r--r-- | arch/x86/mm/init.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 30326443ab8..87488b93a65 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -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) |