diff options
author | Milan P. Stanić <mps@arvanta.net> | 2019-12-05 17:17:43 +0100 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-12-06 14:09:50 +0000 |
commit | 0a9fa811de16d4b13fee9c519016cf6ae12d204a (patch) | |
tree | 124009ca62bd6d39d237516266756a51b8afc458 | |
parent | 4e041956e6571a12c3d20577266d198ee90fa70d (diff) | |
download | aports-0a9fa811de16d4b13fee9c519016cf6ae12d204a.tar.bz2 aports-0a9fa811de16d4b13fee9c519016cf6ae12d204a.tar.xz |
testing/linux-lts: upgrade to 5.4.2
remove x86-fpu-Dont-cache-access-to-fpu_fpregs_owner_ctx.patch, applied
upstream
disable CONFIG_EDAC_DEBUG
enable dm-integrity
fixes: #11012
-rw-r--r-- | testing/linux-lts/APKBUILD | 24 | ||||
-rw-r--r-- | testing/linux-lts/config-lts.aarch64 | 25 | ||||
-rw-r--r-- | testing/linux-lts/config-lts.armv7 | 4 | ||||
-rw-r--r-- | testing/linux-lts/config-lts.ppc64le | 2 | ||||
-rw-r--r-- | testing/linux-lts/config-lts.s390x | 2 | ||||
-rw-r--r-- | testing/linux-lts/config-lts.x86 | 2 | ||||
-rw-r--r-- | testing/linux-lts/config-lts.x86_64 | 6 | ||||
-rw-r--r-- | testing/linux-lts/config-virt.aarch64 | 6 | ||||
-rw-r--r-- | testing/linux-lts/config-virt.x86 | 2 | ||||
-rw-r--r-- | testing/linux-lts/config-virt.x86_64 | 4 | ||||
-rw-r--r-- | testing/linux-lts/x86-fpu-Dont-cache-access-to-fpu_fpregs_owner_ctx.patch | 112 |
11 files changed, 48 insertions, 141 deletions
diff --git a/testing/linux-lts/APKBUILD b/testing/linux-lts/APKBUILD index 608fb2f159..1a4994da19 100644 --- a/testing/linux-lts/APKBUILD +++ b/testing/linux-lts/APKBUILD @@ -2,7 +2,7 @@ _flavor=lts pkgname=linux-${_flavor} -pkgver=5.4.1 +pkgver=5.4.2 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=$pkgver;; @@ -18,7 +18,6 @@ options="!strip" _config=${config:-config-lts.${CARCH}} install= source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz - x86-fpu-Dont-cache-access-to-fpu_fpregs_owner_ctx.patch config-lts.aarch64 config-lts.armv7 config-lts.x86 @@ -230,14 +229,13 @@ _dev() { } sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f linux-5.4.tar.xz -95e19ed9dbdf52e79d0094059330d7f2601acdb3fdb0b74e620964ab037f3a121cccb25605b43dc0cbf7dd9fd8debfffccb15d0f2389cc33434e03d43c9707c0 x86-fpu-Dont-cache-access-to-fpu_fpregs_owner_ctx.patch -7e71693d7150f520e1ecb36bf99e06e2ca0cf30ac7b6e9d4ef40bb325858f48df36febe0f777f0894fdbdd20f40d9a3a0df9e1ff86b3074007c7d9e24d1b7766 config-lts.aarch64 -5e174d07b38da6267db89e7a1561f02d173be6e0362a2aff6545834346274ffacaab4f39323e7e1e184d4fc78743ea53ea82c2ecf99c79b64f044481771a8afd config-lts.armv7 -b643fb1ed83bb23b8cff4fbdb66a1963e0a2e6195e9ce931cebd2774cda095a17442fa06c0d3d944cdf9e09573dc343bbdd327e6b6c900b0c58a6c6fde84cba4 config-lts.x86 -0f53d5fea0044150354f3e323f2d0374c2d8bd6784bd134e049a80d268284a326ab0357e51b9bdce407fefa9194f97370967db78a8a680dc71d1fe57007cec8e config-lts.x86_64 -8fd22417cbe68667f247580f9f08dcb1f483d8403f033731d507f1690a53b725f4a82ab32facb5e8ee49ef6066bf7f0ae8c88685322d34971de4ef05bf5150e5 config-lts.ppc64le -59780f94050f1175c0d7d0dbd8f48aa3d977cb6954d53041f8f5c9ed1a991e1d19d9a9a3408a70645c9cb4903d68a3ab3a01ef44ed1203d756571bd308bade31 config-lts.s390x -a5babb745568a5ff1c8d93ae711b162e3620c23b0b0b9b9e94438cabd4a8de891916c774636815efd95f4d4d887ad12a21c4ac47d4c5b66b4afc31bbdea10260 config-virt.aarch64 -1f397e4abb5504d5a271abe0bc9364acd0182388f9a6c02280ca9db686de7f715aa3e61b0d8a0f488e1bb56267a899166c1deba969488a4b61cc8b50455f3c26 config-virt.x86 -9d2527e571f415ad3f92879825d6bfb5ceed2cb6cc9bd1c5693a0e9f2103f4980dad458607465b50c4c916746c44d529753821d2dbf0c0bc4a5d547d8ae60348 config-virt.x86_64 -93a1eec065cec193c1f741895e181ce915a5be2d985534e339b22778a13801961de0d403fad9c8fb8c35716e6d5a41b646fec79bc9191593ecb90b6ca2b335ce patch-5.4.1.xz" +9c7299179f5bd4cb445c39d2c16c4a8aa555e7c802a5b009cb4ed25aa6af9ce308f4d615e623612c97e6011010ebcbae22620d079504a28611bfda25d6ab370a config-lts.aarch64 +f3e890fcfa8378c07996b28c4bbc04c15bb310c444c7299e542308195f1494689e129047e9b3a72a1f21d22ee07719573f57541238568ab9dfae0193e5f6bbf4 config-lts.armv7 +9b5ebd87496bb121bcea14331e553dbb1d197f3091f958b3e961a07ba68ece7255bb12226bf86c5b82ec7a568c2e71d383af13a2264695cbe6c88d1664dd643c config-lts.x86 +bd815deb587c19be72c5221a4c3573f11e0c4950b8d97aa507c798b680ba1733ccb3f82e6934b85876f7cf94bc1cd3580091e6c2575f750c90eafc9357597519 config-lts.x86_64 +a158573b244f80d0660690efced7e0a5a56c28352700f3ae171b23b0952272369837c5046512159ba3474ef46cc33da953f127fa50014b66db9cb6e63cc44d68 config-lts.ppc64le +f46c885f5325b698c86057f1c1286d76ec2b41ac9d20b36dcdbb88c55722b848c9ab52d0b9605f5f6e0588df34f4f223f0da420c3ee90127052c176e2ff2fc93 config-lts.s390x +ad13aef539f8abfdb861d4d2c75ee517270d500013f77e69a104c82c0a4e8d712fabe7ef41ae96a4d7996ab2a8159e4d35f36be20bc7579f3249b13bd8a12525 config-virt.aarch64 +b4daedb6b96e77e40cf87d83a49acdf27aa8ae37f57e40dedf929336cbb28a173bea444a3b43b54bdcbe9822ef84e3fa92019993c419510911b2477c680dddab config-virt.x86 +c7f558fefa928a9ae87b3be9cfa8742f54533a9c7c7e721acd72131fcb8513d1763597ccd9fbc3a0af50d3ec880e0ecb733f4d18c9b550cda415d9c7fa657e2f config-virt.x86_64 +aba07d75524ad33cd014700a1317c450fe4ea02817dc225848187fa2a353a215011d3ab485d1900796e0797b8c145bbbf10d706ab45784cc9413dbbc96889041 patch-5.4.2.xz" diff --git a/testing/linux-lts/config-lts.aarch64 b/testing/linux-lts/config-lts.aarch64 index 141ac237c9..c736267a4d 100644 --- a/testing/linux-lts/config-lts.aarch64 +++ b/testing/linux-lts/config-lts.aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.4.0 Kernel Configuration +# Linux/arm64 5.4.2 Kernel Configuration # # @@ -426,6 +426,8 @@ CONFIG_ARM64_SVE=y CONFIG_ARM64_MODULE_PLTS=y # CONFIG_ARM64_PSEUDO_NMI is not set # CONFIG_RANDOMIZE_BASE is not set +CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y +CONFIG_STACKPROTECTOR_PER_TASK=y # end of Kernel Features # @@ -914,12 +916,14 @@ CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_HAVE_FAST_GUP=y CONFIG_ARCH_KEEP_MEMBLOCK=y +CONFIG_MEMORY_ISOLATION=y # CONFIG_MEMORY_HOTPLUG is not set CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_MEMORY_BALLOON=y CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y CONFIG_MIGRATION=y +CONFIG_CONTIG_ALLOC=y CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y @@ -932,7 +936,10 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y CONFIG_TRANSPARENT_HUGE_PAGECACHE=y # CONFIG_CLEANCACHE is not set # CONFIG_FRONTSWAP is not set -# CONFIG_CMA is not set +CONFIG_CMA=y +# CONFIG_CMA_DEBUG is not set +# CONFIG_CMA_DEBUGFS is not set +CONFIG_CMA_AREAS=7 CONFIG_ZPOOL=m # CONFIG_ZBUD is not set CONFIG_Z3FOLD=m @@ -2555,7 +2562,7 @@ CONFIG_DM_VERITY=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_SWITCH=m CONFIG_DM_LOG_WRITES=m -# CONFIG_DM_INTEGRITY is not set +CONFIG_DM_INTEGRITY=m CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m @@ -5611,6 +5618,7 @@ CONFIG_DRM_DW_HDMI_CEC=m CONFIG_DRM_VC4=m # CONFIG_DRM_VC4_HDMI_CEC is not set CONFIG_DRM_ETNAVIV=m +CONFIG_DRM_ETNAVIV_THERMAL=y # CONFIG_DRM_ARCPGU is not set # CONFIG_DRM_HISI_HIBMC is not set CONFIG_DRM_HISI_KIRIN=m @@ -8807,6 +8815,17 @@ CONFIG_DMA_VIRT_OPS=y CONFIG_SWIOTLB=y CONFIG_DMA_REMAP=y CONFIG_DMA_DIRECT_REMAP=y +CONFIG_DMA_CMA=y + +# +# Default contiguous memory area size: +# +CONFIG_CMA_SIZE_MBYTES=16 +CONFIG_CMA_SIZE_SEL_MBYTES=y +# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +# CONFIG_CMA_SIZE_SEL_MIN is not set +# CONFIG_CMA_SIZE_SEL_MAX is not set +CONFIG_CMA_ALIGNMENT=8 # CONFIG_DMA_API_DEBUG is not set CONFIG_SGL_ALLOC=y CONFIG_CHECK_SIGNATURE=y diff --git a/testing/linux-lts/config-lts.armv7 b/testing/linux-lts/config-lts.armv7 index 64ebb744d8..b500f1205a 100644 --- a/testing/linux-lts/config-lts.armv7 +++ b/testing/linux-lts/config-lts.armv7 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.4.0 Kernel Configuration +# Linux/arm 5.4.2 Kernel Configuration # # @@ -2300,7 +2300,7 @@ CONFIG_DM_VERITY=m CONFIG_DM_VERITY_FEC=y # CONFIG_DM_SWITCH is not set CONFIG_DM_LOG_WRITES=m -# CONFIG_DM_INTEGRITY is not set +CONFIG_DM_INTEGRITY=m CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m diff --git a/testing/linux-lts/config-lts.ppc64le b/testing/linux-lts/config-lts.ppc64le index ffbd6555c7..1a445e7ea8 100644 --- a/testing/linux-lts/config-lts.ppc64le +++ b/testing/linux-lts/config-lts.ppc64le @@ -1827,7 +1827,7 @@ CONFIG_DM_UEVENT=y # CONFIG_DM_VERITY is not set # CONFIG_DM_SWITCH is not set # CONFIG_DM_LOG_WRITES is not set -# CONFIG_DM_INTEGRITY is not set +CONFIG_DM_INTEGRITY=m # CONFIG_TARGET_CORE is not set # CONFIG_FUSION is not set diff --git a/testing/linux-lts/config-lts.s390x b/testing/linux-lts/config-lts.s390x index eaa99d5b8d..94c0b714a5 100644 --- a/testing/linux-lts/config-lts.s390x +++ b/testing/linux-lts/config-lts.s390x @@ -1865,7 +1865,7 @@ CONFIG_DM_VERITY=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_SWITCH=m CONFIG_DM_LOG_WRITES=m -# CONFIG_DM_INTEGRITY is not set +CONFIG_DM_INTEGRITY=m CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m diff --git a/testing/linux-lts/config-lts.x86 b/testing/linux-lts/config-lts.x86 index a899fe3fe4..2c657bba8b 100644 --- a/testing/linux-lts/config-lts.x86 +++ b/testing/linux-lts/config-lts.x86 @@ -2512,7 +2512,7 @@ CONFIG_DM_VERITY=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_SWITCH=m CONFIG_DM_LOG_WRITES=m -# CONFIG_DM_INTEGRITY is not set +CONFIG_DM_INTEGRITY=m CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m diff --git a/testing/linux-lts/config-lts.x86_64 b/testing/linux-lts/config-lts.x86_64 index dc2e7cbfa0..d13449e464 100644 --- a/testing/linux-lts/config-lts.x86_64 +++ b/testing/linux-lts/config-lts.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.4.0 Kernel Configuration +# Linux/x86_64 5.4.2 Kernel Configuration # # @@ -2567,7 +2567,7 @@ CONFIG_DM_VERITY=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_SWITCH=m CONFIG_DM_LOG_WRITES=m -# CONFIG_DM_INTEGRITY is not set +CONFIG_DM_INTEGRITY=m CONFIG_TARGET_CORE=m CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m @@ -6547,7 +6547,7 @@ CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y CONFIG_EDAC=y CONFIG_EDAC_LEGACY_SYSFS=y -CONFIG_EDAC_DEBUG=y +# CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_DECODE_MCE=y CONFIG_EDAC_AMD64=m # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set diff --git a/testing/linux-lts/config-virt.aarch64 b/testing/linux-lts/config-virt.aarch64 index d178bc004b..e6ce3dc38b 100644 --- a/testing/linux-lts/config-virt.aarch64 +++ b/testing/linux-lts/config-virt.aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.4.0 Kernel Configuration +# Linux/arm64 5.4.2 Kernel Configuration # # @@ -411,6 +411,8 @@ CONFIG_ARM64_SVE=y CONFIG_ARM64_MODULE_PLTS=y # CONFIG_ARM64_PSEUDO_NMI is not set # CONFIG_RANDOMIZE_BASE is not set +CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y +CONFIG_STACKPROTECTOR_PER_TASK=y # end of Kernel Features # @@ -2208,7 +2210,7 @@ CONFIG_DM_VERITY=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_SWITCH=m CONFIG_DM_LOG_WRITES=m -# CONFIG_DM_INTEGRITY is not set +CONFIG_DM_INTEGRITY=m CONFIG_TARGET_CORE=m # CONFIG_TCM_IBLOCK is not set # CONFIG_TCM_FILEIO is not set diff --git a/testing/linux-lts/config-virt.x86 b/testing/linux-lts/config-virt.x86 index 3e583677c2..061be95127 100644 --- a/testing/linux-lts/config-virt.x86 +++ b/testing/linux-lts/config-virt.x86 @@ -2048,7 +2048,7 @@ CONFIG_DM_VERITY=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_SWITCH=m CONFIG_DM_LOG_WRITES=m -# CONFIG_DM_INTEGRITY is not set +CONFIG_DM_INTEGRITY=m # CONFIG_TARGET_CORE is not set CONFIG_FUSION=y CONFIG_FUSION_SPI=m diff --git a/testing/linux-lts/config-virt.x86_64 b/testing/linux-lts/config-virt.x86_64 index 3083102db7..2a91eb7b04 100644 --- a/testing/linux-lts/config-virt.x86_64 +++ b/testing/linux-lts/config-virt.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.0 Kernel Configuration +# Linux/x86_64 5.4.2 Kernel Configuration # # @@ -2110,7 +2110,7 @@ CONFIG_DM_VERITY=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_SWITCH=m CONFIG_DM_LOG_WRITES=m -# CONFIG_DM_INTEGRITY is not set +CONFIG_DM_INTEGRITY=m CONFIG_TARGET_CORE=m # CONFIG_TCM_IBLOCK is not set # CONFIG_TCM_FILEIO is not set diff --git a/testing/linux-lts/x86-fpu-Dont-cache-access-to-fpu_fpregs_owner_ctx.patch b/testing/linux-lts/x86-fpu-Dont-cache-access-to-fpu_fpregs_owner_ctx.patch deleted file mode 100644 index a59bc41d1b..0000000000 --- a/testing/linux-lts/x86-fpu-Dont-cache-access-to-fpu_fpregs_owner_ctx.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 59c4bd853abcea95eccc167a7d7fd5f1a5f47b98 Mon Sep 17 00:00:00 2001 -From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> -Date: Thu, 28 Nov 2019 09:53:06 +0100 -Subject: x86/fpu: Don't cache access to fpu_fpregs_owner_ctx -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The state/owner of the FPU is saved to fpu_fpregs_owner_ctx by pointing -to the context that is currently loaded. It never changed during the -lifetime of a task - it remained stable/constant. - -After deferred FPU registers loading until return to userland was -implemented, the content of fpu_fpregs_owner_ctx may change during -preemption and must not be cached. - -This went unnoticed for some time and was now noticed, in particular -since gcc 9 is caching that load in copy_fpstate_to_sigframe() and -reusing it in the retry loop: - - copy_fpstate_to_sigframe() - load fpu_fpregs_owner_ctx and save on stack - fpregs_lock() - copy_fpregs_to_sigframe() /* failed */ - fpregs_unlock() - *** PREEMPTION, another uses FPU, changes fpu_fpregs_owner_ctx *** - - fault_in_pages_writeable() /* succeed, retry */ - - fpregs_lock() - __fpregs_load_activate() - fpregs_state_valid() /* uses fpu_fpregs_owner_ctx from stack */ - copy_fpregs_to_sigframe() /* succeeds, random FPU content */ - -This is a comparison of the assembly produced by gcc 9, without vs with this -patch: - -| # arch/x86/kernel/fpu/signal.c:173: if (!access_ok(buf, size)) -| cmpq %rdx, %rax # tmp183, _4 -| jb .L190 #, -|-# arch/x86/include/asm/fpu/internal.h:512: return fpu == this_cpu_read_stable(fpu_fpregs_owner_ctx) && cpu == fpu->last_cpu; -|-#APP -|-# 512 "arch/x86/include/asm/fpu/internal.h" 1 -|- movq %gs:fpu_fpregs_owner_ctx,%rax #, pfo_ret__ -|-# 0 "" 2 -|-#NO_APP -|- movq %rax, -88(%rbp) # pfo_ret__, %sfp -… -|-# arch/x86/include/asm/fpu/internal.h:512: return fpu == this_cpu_read_stable(fpu_fpregs_owner_ctx) && cpu == fpu->last_cpu; -|- movq -88(%rbp), %rcx # %sfp, pfo_ret__ -|- cmpq %rcx, -64(%rbp) # pfo_ret__, %sfp -|+# arch/x86/include/asm/fpu/internal.h:512: return fpu == this_cpu_read(fpu_fpregs_owner_ctx) && cpu == fpu->last_cpu; -|+#APP -|+# 512 "arch/x86/include/asm/fpu/internal.h" 1 -|+ movq %gs:fpu_fpregs_owner_ctx(%rip),%rax # fpu_fpregs_owner_ctx, pfo_ret__ -|+# 0 "" 2 -|+# arch/x86/include/asm/fpu/internal.h:512: return fpu == this_cpu_read(fpu_fpregs_owner_ctx) && cpu == fpu->last_cpu; -|+#NO_APP -|+ cmpq %rax, -64(%rbp) # pfo_ret__, %sfp - -Use this_cpu_read() instead this_cpu_read_stable() to avoid caching of -fpu_fpregs_owner_ctx during preemption points. - -The Fixes: tag points to the commit where deferred FPU loading was -added. Since this commit, the compiler is no longer allowed to move the -load of fpu_fpregs_owner_ctx somewhere else / outside of the locked -section. A task preemption will change its value and stale content will -be observed. - - [ bp: Massage. ] - -Debugged-by: Austin Clements <austin@google.com> -Debugged-by: David Chase <drchase@golang.org> -Debugged-by: Ian Lance Taylor <ian@airs.com> -Fixes: 5f409e20b7945 ("x86/fpu: Defer FPU state load until return to userspace") -Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> -Signed-off-by: Borislav Petkov <bp@suse.de> -Reviewed-by: Rik van Riel <riel@surriel.com> -Tested-by: Borislav Petkov <bp@suse.de> -Cc: Aubrey Li <aubrey.li@intel.com> -Cc: Austin Clements <austin@google.com> -Cc: Barret Rhoden <brho@google.com> -Cc: Dave Hansen <dave.hansen@intel.com> -Cc: David Chase <drchase@golang.org> -Cc: "H. Peter Anvin" <hpa@zytor.com> -Cc: ian@airs.com -Cc: Ingo Molnar <mingo@redhat.com> -Cc: Josh Bleecher Snyder <josharian@gmail.com> -Cc: Thomas Gleixner <tglx@linutronix.de> -Cc: x86-ml <x86@kernel.org> -Link: https://lkml.kernel.org/r/20191128085306.hxfa2o3knqtu4wfn@linutronix.de -Link: https://bugzilla.kernel.org/show_bug.cgi?id=205663 ---- - arch/x86/include/asm/fpu/internal.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/x86/include/asm/fpu/internal.h b/arch/x86/include/asm/fpu/internal.h -index 4c95c36..44c48e3 100644 ---- a/arch/x86/include/asm/fpu/internal.h -+++ b/arch/x86/include/asm/fpu/internal.h -@@ -509,7 +509,7 @@ static inline void __fpu_invalidate_fpregs_state(struct fpu *fpu) - - static inline int fpregs_state_valid(struct fpu *fpu, unsigned int cpu) - { -- return fpu == this_cpu_read_stable(fpu_fpregs_owner_ctx) && cpu == fpu->last_cpu; -+ return fpu == this_cpu_read(fpu_fpregs_owner_ctx) && cpu == fpu->last_cpu; - } - - /* --- -cgit v1.1 - |