This is a note to let you know that I've just added the patch titled

    x86, mm: Undo incorrect revert in arch/x86/mm/init.c

to the 3.6-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     x86-mm-undo-incorrect-revert-in-arch-x86-mm-init.c.patch
and it can be found in the queue-3.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From f82f64dd9f485e13f29f369772d4a0e868e5633a Mon Sep 17 00:00:00 2001
From: Yinghai Lu <[email protected]>
Date: Thu, 25 Oct 2012 15:45:26 -0700
Subject: x86, mm: Undo incorrect revert in arch/x86/mm/init.c

From: Yinghai Lu <[email protected]>

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 <[email protected]>
Link: 
http://lkml.kernel.org/r/CAE9FiQW_vuaYQbmagVnxT2DGsYc=9tneabdbq53sykitpow...@mail.gmail.com
Acked-by: Jacob Shin <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 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;


Patches currently in stable-queue which might be from [email protected] are

queue-3.6/x86-mm-undo-incorrect-revert-in-arch-x86-mm-init.c.patch
queue-3.6/x86-mm-trim-memory-in-memblock-to-be-page-aligned.patch
queue-3.6/revert-x86-mm-fix-the-size-calculation-of-mapping-tables.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to