diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2017-02-27 13:56:47 -0800 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2017-02-27 13:56:47 -0800 |
| commit | 9504d1311abcd47f36799cc79ad1968e2449bbfb (patch) | |
| tree | 16db6d35a664ad5b24c5d1c11417e62b760dcc27 | |
| parent | 4ccb99b25f89f131412551dd9e05637b192d1c10 (diff) | |
| download | kernel-9504d1311abcd47f36799cc79ad1968e2449bbfb.tar.gz kernel-9504d1311abcd47f36799cc79ad1968e2449bbfb.tar.xz kernel-9504d1311abcd47f36799cc79ad1968e2449bbfb.zip | |
Actual fix from upstream
| -rw-r--r-- | 0001-Revert-part-of-a00cc7d9dd93-mm-x86-add-support-for-P.patch | 32 | ||||
| -rw-r--r-- | 0001-mm-x86-fix-HIGHMEM64-PARAVIRT-build-config-for-nativ.patch | 36 | ||||
| -rw-r--r-- | kernel.spec | 2 |
3 files changed, 37 insertions, 33 deletions
diff --git a/0001-Revert-part-of-a00cc7d9dd93-mm-x86-add-support-for-P.patch b/0001-Revert-part-of-a00cc7d9dd93-mm-x86-add-support-for-P.patch deleted file mode 100644 index 37583fdde..000000000 --- a/0001-Revert-part-of-a00cc7d9dd93-mm-x86-add-support-for-P.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 100c6404fbe6ddbe450b3a2bcac8cd6488d05401 Mon Sep 17 00:00:00 2001 -From: Laura Abbott <labbott@redhat.com> -Date: Mon, 27 Feb 2017 10:46:13 -0800 -Subject: [PATCH] Revert part of a00cc7d9dd93 ("mm, x86: add support for - PUD-sized transparent hugepages") - -Build issue, reported upstream. - -Signed-off-by: Laura Abbott <labbott@redhat.com> ---- - arch/x86/include/asm/pgtable-3level.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h -index 8f50fb3..50d35e3 100644 ---- a/arch/x86/include/asm/pgtable-3level.h -+++ b/arch/x86/include/asm/pgtable-3level.h -@@ -121,11 +121,9 @@ static inline void native_pmd_clear(pmd_t *pmd) - *(tmp + 1) = 0; - } - --#ifndef CONFIG_SMP - static inline void native_pud_clear(pud_t *pudp) - { - } --#endif - - static inline void pud_clear(pud_t *pudp) - { --- -2.7.4 - 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 530fa4792..247f0d167 100644 --- a/kernel.spec +++ b/kernel.spec @@ -590,7 +590,7 @@ Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch Patch853: 0001-Work-around-for-gcc7-and-arm64.patch # compile error -Patch854: 0001-Revert-part-of-a00cc7d9dd93-mm-x86-add-support-for-P.patch +Patch854: 0001-mm-x86-fix-HIGHMEM64-PARAVIRT-build-config-for-nativ.patch # END OF PATCH DEFINITIONS |