diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-02-28 11:14:34 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-02-28 11:14:34 +0100 |
| commit | 616685be2ff93b8a40ee3a000d24b0e4d5256e44 (patch) | |
| tree | 65fd3242b73c364347d6721c2d2ae8e4d9220e52 | |
| parent | 9dadb8016b93b029ff9fc611c44236f837aad1c3 (diff) | |
| parent | 9504d1311abcd47f36799cc79ad1968e2449bbfb (diff) | |
| download | kernel-616685be2ff93b8a40ee3a000d24b0e4d5256e44.tar.gz kernel-616685be2ff93b8a40ee3a000d24b0e4d5256e44.tar.xz kernel-616685be2ff93b8a40ee3a000d24b0e4d5256e44.zip | |
merge master
| -rw-r--r-- | 0001-mm-x86-fix-HIGHMEM64-PARAVIRT-build-config-for-nativ.patch | 36 | ||||
| -rw-r--r-- | kernel.spec | 3 |
2 files changed, 39 insertions, 0 deletions
diff --git a/0001-mm-x86-fix-HIGHMEM64-PARAVIRT-build-config-for-nativ.patch b/0001-mm-x86-fix-HIGHMEM64-PARAVIRT-build-config-for-nativ.patch new file mode 100644 index 000000000..fe873432b --- /dev/null +++ b/0001-mm-x86-fix-HIGHMEM64-PARAVIRT-build-config-for-nativ.patch @@ -0,0 +1,36 @@ +From af8071ce3168509e372a2c6108bc0c758f79e49c Mon Sep 17 00:00:00 2001 +From: Dave Jiang <dave.jiang@intel.com> +Date: Mon, 27 Feb 2017 14:44:40 -0700 +Subject: [PATCH] mm, x86: fix HIGHMEM64 && PARAVIRT build config for + native_pud_clear() + +Looks like I also missed the build config that includes +CONFIG_HIGHMEM64G && CONFIG_PARAVIRT to export the native_pud_clear() +dummy function. + +Fix: commit e5d56efc ("mm,x86: fix SMP x86 32bit build for native_pud_clear()") + +Reported-by: Laura Abbott <labbott@redhat.com> +Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> +Signed-off-by: Dave Jiang <dave.jiang@intel.com> +--- + arch/x86/include/asm/pgtable-3level.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h +index 8f50fb3..72277b1 100644 +--- a/arch/x86/include/asm/pgtable-3level.h ++++ b/arch/x86/include/asm/pgtable-3level.h +@@ -121,7 +121,8 @@ static inline void native_pmd_clear(pmd_t *pmd) + *(tmp + 1) = 0; + } + +-#ifndef CONFIG_SMP ++#if !defined(CONFIG_SMP) || (defined(CONFIG_HIGHMEM64G) && \ ++ defined(CONFIG_PARAVIRT)) + static inline void native_pud_clear(pud_t *pudp) + { + } +-- +2.7.4 + diff --git a/kernel.spec b/kernel.spec index 0639e72b5..96c499992 100644 --- a/kernel.spec +++ b/kernel.spec @@ -606,6 +606,9 @@ Patch509: MODSIGN-Don-t-try-secure-boot-if-EFI-runtime-is-disa.patch #CVE-2016-3134 rhbz 1317383 1317384 Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch +# compile error +Patch854: 0001-mm-x86-fix-HIGHMEM64-PARAVIRT-build-config-for-nativ.patch + # END OF PATCH DEFINITIONS %endif |