* Patch "x86/mm/pat, x86/cpufeature: Remove cpu_has_pat" has been added to the 4.4-stable tree
@ 2018-06-13 16:47 gregkh
2018-06-13 16:55 ` ✗ Fi.CI.BAT: failure for " Patchwork
0 siblings, 1 reply; 2+ messages in thread
From: gregkh @ 2018-06-13 16:47 UTC (permalink / raw)
To: 1459266123-21878-9-git-send-email-bp, bp, daniel.vetter, gregkh,
intel-gfx, mingo, peterz, tglx, torvalds
Cc: stable-commits
This is a note to let you know that I've just added the patch titled
x86/mm/pat, x86/cpufeature: Remove cpu_has_pat
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-mm-pat-x86-cpufeature-remove-cpu_has_pat.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
From 568a58e5dfbcb88011cad7f87ed046aa00f19d1a Mon Sep 17 00:00:00 2001
From: Borislav Petkov <bp@suse.de>
Date: Tue, 29 Mar 2016 17:42:01 +0200
Subject: x86/mm/pat, x86/cpufeature: Remove cpu_has_pat
From: Borislav Petkov <bp@suse.de>
commit 568a58e5dfbcb88011cad7f87ed046aa00f19d1a upstream.
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: intel-gfx@lists.freedesktop.org
Link: http://lkml.kernel.org/r/1459266123-21878-9-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/x86/include/asm/cpufeature.h | 1 -
drivers/gpu/drm/i915/i915_gem.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -380,7 +380,6 @@ extern const char * const x86_bug_flags[
#define cpu_has_avx2 boot_cpu_has(X86_FEATURE_AVX2)
#define cpu_has_clflush boot_cpu_has(X86_FEATURE_CLFLUSH)
#define cpu_has_gbpages boot_cpu_has(X86_FEATURE_GBPAGES)
-#define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT)
#define cpu_has_x2apic boot_cpu_has(X86_FEATURE_X2APIC)
#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)
#define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1730,7 +1730,7 @@ i915_gem_mmap_ioctl(struct drm_device *d
if (args->flags & ~(I915_MMAP_WC))
return -EINVAL;
- if (args->flags & I915_MMAP_WC && !cpu_has_pat)
+ if (args->flags & I915_MMAP_WC && !boot_cpu_has(X86_FEATURE_PAT))
return -ENODEV;
obj = drm_gem_object_lookup(dev, file, args->handle);
Patches currently in stable-queue which might be from bp@suse.de are
queue-4.4/x86-fpu-disable-mpx-when-eagerfpu-is-off.patch
queue-4.4/x86-fpu-disable-avx-when-eagerfpu-is-off.patch
queue-4.4/x86-cpufeature-remove-cpu_has_xmm2.patch
queue-4.4/x86-cpufeature-remove-unused-and-seldomly-used-cpu_has_xx-macros.patch
queue-4.4/x86-cpufeature-replace-cpu_has_avx2-with-boot_cpu_has-usage.patch
queue-4.4/x86-cpufeature-replace-cpu_has_aes-with-boot_cpu_has-usage.patch
queue-4.4/x86-fpu-fix-eager-fpu-handling-on-legacy-fpu-machines.patch
queue-4.4/x86-cpufeature-remove-cpu_has_pse.patch
queue-4.4/x86-cpufeature-remove-cpu_has_osxsave.patch
queue-4.4/x86-mm-pat-x86-cpufeature-remove-cpu_has_pat.patch
queue-4.4/x86-fpu-revert-x86-fpu-disable-avx-when-eagerfpu-is-off.patch
queue-4.4/x86-cpufeature-remove-cpu_has_gbpages.patch
queue-4.4/x86-fpu-fix-early-fpu-command-line-parsing.patch
queue-4.4/x86-cpufeature-remove-cpu_has_x2apic.patch
queue-4.4/x86-cpufeature-remove-cpu_has_clflush.patch
queue-4.4/x86-cpufeature-remove-cpu_has_arch_perfmon.patch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 2+ messages in thread
* ✗ Fi.CI.BAT: failure for Patch "x86/mm/pat, x86/cpufeature: Remove cpu_has_pat" has been added to the 4.4-stable tree
2018-06-13 16:47 Patch "x86/mm/pat, x86/cpufeature: Remove cpu_has_pat" has been added to the 4.4-stable tree gregkh
@ 2018-06-13 16:55 ` Patchwork
0 siblings, 0 replies; 2+ messages in thread
From: Patchwork @ 2018-06-13 16:55 UTC (permalink / raw)
To: gregkh; +Cc: intel-gfx
== Series Details ==
Series: Patch "x86/mm/pat, x86/cpufeature: Remove cpu_has_pat" has been added to the 4.4-stable tree
URL : https://patchwork.freedesktop.org/series/44708/
State : failure
== Summary ==
Applying: Patch "x86/mm/pat, x86/cpufeature: Remove cpu_has_pat" has been added to the 4.4-stable tree
error: sha1 information is lacking or useless (arch/x86/include/asm/cpufeature.h).
error: could not build fake ancestor
Patch failed at 0001 Patch "x86/mm/pat, x86/cpufeature: Remove cpu_has_pat" has been added to the 4.4-stable tree
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-06-13 16:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-13 16:47 Patch "x86/mm/pat, x86/cpufeature: Remove cpu_has_pat" has been added to the 4.4-stable tree gregkh
2018-06-13 16:55 ` ✗ Fi.CI.BAT: failure for " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.