Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 568a58e5 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/mm/pat, x86/cpufeature: Remove cpu_has_pat 



Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarDaniel 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: default avatarIngo Molnar <mingo@kernel.org>
parent b6350c21

arch/x86/include/asm/cpufeature.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -132,7 +132,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 
#define cpu_has_clflush		boot_cpu_has(X86_FEATURE_CLFLUSH)

#define cpu_has_clflush		boot_cpu_has(X86_FEATURE_CLFLUSH)

#define cpu_has_gbpages		boot_cpu_has(X86_FEATURE_GBPAGES)

#define cpu_has_gbpages		boot_cpu_has(X86_FEATURE_GBPAGES)

#define cpu_has_arch_perfmon	boot_cpu_has(X86_FEATURE_ARCH_PERFMON)

#define cpu_has_arch_perfmon	boot_cpu_has(X86_FEATURE_ARCH_PERFMON)

#define cpu_has_pat		boot_cpu_has(X86_FEATURE_PAT)

#define cpu_has_x2apic		boot_cpu_has(X86_FEATURE_X2APIC)

#define cpu_has_x2apic		boot_cpu_has(X86_FEATURE_X2APIC)

#define cpu_has_xsave		boot_cpu_has(X86_FEATURE_XSAVE)

#define cpu_has_xsave		boot_cpu_has(X86_FEATURE_XSAVE)

#define cpu_has_xsaves		boot_cpu_has(X86_FEATURE_XSAVES)

#define cpu_has_xsaves		boot_cpu_has(X86_FEATURE_XSAVES)

drivers/gpu/drm/i915/i915_gem.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1732,7 +1732,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, 
	if (args->flags & ~(I915_MMAP_WC))

	if (args->flags & ~(I915_MMAP_WC))

		return -EINVAL;

		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;

		return -ENODEV;





	obj = drm_gem_object_lookup(dev, file, args->handle);

	obj = drm_gem_object_lookup(dev, file, args->handle);