diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-10-19 19:05:26 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-10-19 20:05:48 +0100 |
commit | 38fac8bffca212e932f306c4a27e5b35d3c29419 (patch) | |
tree | 8dd08520200e37bda07cfe6d89762f06a3e20768 /drivers/gpu/drm/i915/Kconfig | |
parent | 613a308159e5dd569d4d480ff0387628724926ca (diff) | |
download | op-kernel-dev-38fac8bffca212e932f306c4a27e5b35d3c29419.zip op-kernel-dev-38fac8bffca212e932f306c4a27e5b35d3c29419.tar.gz |
drm/i915: STOP_MACHINE is no more, stop selecting it
The STOP_MACHINE kconfig symbol was removed upstream after making
stop_machine() always work, commit 86fffe4a61dd ("kernel: remove
stop_machine() Kconfig dependency"), and was removed from i915's Kconfig
in commit 21fabbebff0e ("drm/i915: Remove select to deleted
STOP_MACHINE from Kconfig").
However, I accidentally reintroduced the select when rebasing an older
commit that also was dependent upon a working stop_machine.
Fixes: 9f267eb8d2ea ("drm/i915: Stop the machine whilst capturing...")
Reported-by: Valentin Rothberg <valentinrothberg@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161019180635.27459-1-chris@chris-wilson.co.uk
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/Kconfig')
-rw-r--r-- | drivers/gpu/drm/i915/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig index 6aedc96..1c1b19c 100644 --- a/drivers/gpu/drm/i915/Kconfig +++ b/drivers/gpu/drm/i915/Kconfig @@ -4,7 +4,6 @@ config DRM_I915 depends on X86 && PCI select INTEL_GTT select INTERVAL_TREE - select STOP_MACHINE # we need shmfs for the swappable backing store, and in particular # the shmem_readpage() which depends upon tmpfs select SHMEM |