diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-04-13 11:36:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-04-13 11:36:19 +0200 |
| commit | d8d1c35139481ee8e292d91cd3fd35a6b3a316eb (patch) | |
| tree | 0a06b6c185e91bf14b22e7f526755e2ca80209bf /drivers | |
| parent | Merge branch 'x86/cpu' into x86/asm, to merge more patches (diff) | |
| parent | x86/mm/pat: Fix BUG_ON() in mmap_mem() on QEMU/i386 (diff) | |
| download | linux-dev-d8d1c35139481ee8e292d91cd3fd35a6b3a316eb.tar.xz linux-dev-d8d1c35139481ee8e292d91cd3fd35a6b3a316eb.zip | |
Merge branch 'x86/mm' into x86/asm to resolve conflict and to create common base
Conflicts:
arch/x86/include/asm/cpufeature.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 3d31d3ac589e..aaec8aef9fd4 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1732,7 +1732,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data, 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); |