3.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Yinghai Lu <ying...@kernel.org>

commit f82f64dd9f485e13f29f369772d4a0e868e5633a upstream.

Commit

    844ab6f9 x86, mm: Find_early_table_space based on ranges that are actually 
being mapped

added back some lines back wrongly that has been removed in commit

    7b16bbf97 Revert "x86/mm: Fix the size calculation of mapping tables"

remove them again.

Signed-off-by: Yinghai Lu <ying...@kernel.org>
Link: 
http://lkml.kernel.org/r/CAE9FiQW_vuaYQbmagVnxT2DGsYc=9tneabdbq53sykitpow...@mail.gmail.com
Acked-by: Jacob Shin <jacob.s...@amd.com>
Signed-off-by: H. Peter Anvin <h...@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 arch/x86/mm/init.c |    4 ----
 1 file changed, 4 deletions(-)

--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -65,10 +65,6 @@ static void __init find_early_table_spac
 #ifdef CONFIG_X86_32
                        extra += PMD_SIZE;
 #endif
-                       /* The first 2/4M doesn't use large pages. */
-                       if (mr[i].start < PMD_SIZE)
-                               extra += range;
-
                        ptes += (extra + PAGE_SIZE - 1) >> PAGE_SHIFT;
                } else {
                        ptes += (range + PAGE_SIZE - 1) >> PAGE_SHIFT;


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to