From: Greg Kroah-Hartman Date: Wed, 23 Sep 2015 05:09:03 +0000 (-0700) Subject: 3.10-stable patches X-Git-Tag: v4.1.9~43 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc52f91309dd47d4c6ce21cf2d922f4dafaee1d2;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: x86-mm-initialize-pmd_idx-in-page_table_range_init_count.patch --- diff --git a/queue-3.10/series b/queue-3.10/series index b8c1bf85831..8d3ed1cb3b7 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -11,3 +11,4 @@ alsa-hda-use-alc880_fixup_fujitsu-for-fsc-amilo-m1437.patch powerpc-mm-fix-pte_pagesize_index-crash-on-4k-w-64k-hash.patch powerpc-rtas-introduce-rtas_get_sensor_fast-for-irq-handlers.patch add-radeon-suspend-resume-quirk-for-hp-compaq-dc5750.patch +x86-mm-initialize-pmd_idx-in-page_table_range_init_count.patch diff --git a/queue-3.10/x86-mm-initialize-pmd_idx-in-page_table_range_init_count.patch b/queue-3.10/x86-mm-initialize-pmd_idx-in-page_table_range_init_count.patch new file mode 100644 index 00000000000..d2c77975454 --- /dev/null +++ b/queue-3.10/x86-mm-initialize-pmd_idx-in-page_table_range_init_count.patch @@ -0,0 +1,38 @@ +From 9962eea9e55f797f05f20ba6448929cab2a9f018 Mon Sep 17 00:00:00 2001 +From: Minfei Huang +Date: Sun, 12 Jul 2015 20:18:42 +0800 +Subject: x86/mm: Initialize pmd_idx in page_table_range_init_count() + +From: Minfei Huang + +commit 9962eea9e55f797f05f20ba6448929cab2a9f018 upstream. + +The variable pmd_idx is not initialized for the first iteration of the +for loop. + +Assign the proper value which indexes the start address. + +Fixes: 719272c45b82 'x86, mm: only call early_ioremap_page_table_range_init() once' +Signed-off-by: Minfei Huang +Cc: tony.luck@intel.com +Cc: wangnan0@huawei.com +Cc: david.vrabel@citrix.com +Reviewed-by: yinghai@kernel.org +Link: http://lkml.kernel.org/r/1436703522-29552-1-git-send-email-mhuang@redhat.com +Signed-off-by: Thomas Gleixner +Signed-off-by: Greg Kroah-Hartman + +--- + arch/x86/mm/init_32.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/x86/mm/init_32.c ++++ b/arch/x86/mm/init_32.c +@@ -137,6 +137,7 @@ page_table_range_init_count(unsigned lon + + vaddr = start; + pgd_idx = pgd_index(vaddr); ++ pmd_idx = pmd_index(vaddr); + + for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd_idx++) { + for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);