From: Greg Kroah-Hartman Date: Fri, 2 Nov 2018 17:05:52 +0000 (+0100) Subject: fuzz cleanup for 4.9 X-Git-Tag: v4.19.1~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f63f78f53048e5fa9ab3287bd33c97279eff35ae;p=thirdparty%2Fkernel%2Fstable-queue.git fuzz cleanup for 4.9 --- diff --git a/queue-4.9/revert-x86-mm-expand-static-page-table-for-fixmap-sp.patch b/queue-4.9/revert-x86-mm-expand-static-page-table-for-fixmap-sp.patch index c19bbdf22c7..50b52de390b 100644 --- a/queue-4.9/revert-x86-mm-expand-static-page-table-for-fixmap-sp.patch +++ b/queue-4.9/revert-x86-mm-expand-static-page-table-for-fixmap-sp.patch @@ -22,15 +22,13 @@ be reverted for the 4.9 branch. Signed-off-by: Sasha Levin --- - arch/x86/include/asm/fixmap.h | 10 ---------- - arch/x86/include/asm/pgtable_64.h | 3 +-- - arch/x86/kernel/head_64.S | 16 ++++------------ - arch/x86/mm/pgtable.c | 9 --------- - arch/x86/xen/mmu.c | 8 ++------ + arch/x86/include/asm/fixmap.h | 10 ---------- + arch/x86/include/asm/pgtable_64.h | 3 +-- + arch/x86/kernel/head_64.S | 16 ++++------------ + arch/x86/mm/pgtable.c | 9 --------- + arch/x86/xen/mmu.c | 8 ++------ 5 files changed, 7 insertions(+), 39 deletions(-) -diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h -index 25152843dd1f..8554f960e21b 100644 --- a/arch/x86/include/asm/fixmap.h +++ b/arch/x86/include/asm/fixmap.h @@ -14,16 +14,6 @@ @@ -50,8 +48,6 @@ index 25152843dd1f..8554f960e21b 100644 #ifndef __ASSEMBLY__ #include #include -diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h -index d5c4df98aac3..221a32ed1372 100644 --- a/arch/x86/include/asm/pgtable_64.h +++ b/arch/x86/include/asm/pgtable_64.h @@ -13,14 +13,13 @@ @@ -70,8 +66,6 @@ index d5c4df98aac3..221a32ed1372 100644 extern pgd_t init_level4_pgt[]; #define swapper_pg_dir init_level4_pgt -diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S -index b0d6697ab153..9d72cf547c88 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -23,7 +23,6 @@ @@ -107,11 +101,9 @@ index b0d6697ab153..9d72cf547c88 100644 #undef PMDS -diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c -index 8cbed30feb67..e30baa8ad94f 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c -@@ -536,15 +536,6 @@ void __native_set_fixmap(enum fixed_addresses idx, pte_t pte) +@@ -536,15 +536,6 @@ void __native_set_fixmap(enum fixed_addr { unsigned long address = __fix_to_virt(idx); @@ -127,11 +119,9 @@ index 8cbed30feb67..e30baa8ad94f 100644 if (idx >= __end_of_fixed_addresses) { BUG(); return; -diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c -index ebceaba20ad1..c92f75f7ae33 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c -@@ -1936,7 +1936,7 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) +@@ -1936,7 +1936,7 @@ void __init xen_setup_kernel_pagetable(p * L3_k[511] -> level2_fixmap_pgt */ convert_pfn_mfn(level3_kernel_pgt); @@ -140,7 +130,7 @@ index ebceaba20ad1..c92f75f7ae33 100644 convert_pfn_mfn(level2_fixmap_pgt); } /* We get [511][511] and have Xen's version of level2_kernel_pgt */ -@@ -1970,11 +1970,7 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn) +@@ -1970,11 +1970,7 @@ void __init xen_setup_kernel_pagetable(p set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO); set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); @@ -153,6 +143,3 @@ index ebceaba20ad1..c92f75f7ae33 100644 /* Pin down new L4 */ pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE, --- -2.17.1 -