Re: [tip:x86/urgent] x86, mm: Find_early_table_space based on ranges that are actually being mapped

[Yinghai Lu <yinghai@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 535 bytes --]

On Thu, Oct 25, 2012 at 12:55 AM, Ingo Molnar <mingo@kernel.org> wrote:
>> > -               ptes = (end + PAGE_SIZE - 1) >> PAGE_SHIFT;
>> > +                       /* The first 2/4M doesn't use large pages. */
>> > +                       if (mr[i].start < PMD_SIZE)
>> > +                               extra += range;
>>
>> those three lines should be added back.

missed "not" ...

>>
>> it just get reverted in 7b16bbf9
>
> Could you please send a delta patch against tip:x86/urgent?

please check attached one.

Thanks

Yinghai

[-- Attachment #2: remove_wrong_addback.patch --]
[-- Type: application/octet-stream, Size: 859 bytes --]

Subject: [PATCH] x86, mm: Remove wrong add back

commit 844ab6f9
    x86, mm: Find_early_table_space based on ranges that are actually being mapped
add back some lines back wrongly that has been reverted in commit 7b16bbf97
    Revert "x86/mm: Fix the size calculation of mapping tables"

remove them again.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index bc287d6..d7aea41 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -65,10 +65,6 @@ static void __init find_early_table_space(struct map_range *mr, int nr_range)
 #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;