CHROMIUM: dma-buf/kds: allow KDS to be compiled out if dma-buf is enabled
authorDaniel Kurtz <djkurtz@chromium.org>
Wed, 24 Apr 2013 04:27:38 +0000 (12:27 +0800)
committerChromeBot <chrome-bot@google.com>
Thu, 2 May 2013 03:30:08 +0000 (20:30 -0700)
commitc9e0796a2e0163768b80f99a6817f1d0403c0120
treeb485efc9f14415cdf3c325a1bd8165b61d26dc2c
parent070963eacbf6d1053d8dff392ac35a98964bf300
CHROMIUM: dma-buf/kds: allow KDS to be compiled out if dma-buf is enabled

The original KDS patches added CONFIG_DMA_SHARED_BUFFER_USES_KDS but
didn't use it to guard the kds integration into dma-bufs in a way
that would allow dma-buf to be built with KDS compiled without
requiring KDS.

Fix this by more carefully guarding the integration points, and not
unconditionally selecting KDS when dma-buf is enabled.

Signed-off-by: Sonny Rao <sonnyrao@chromium.org>
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
BUG=chromium:232913
TEST=compile kernel for x86 and arm and verify it still boots

Change-Id: I878d1313ce6b43477fd6c87d394728283ad4f9e6
Reviewed-on: https://gerrit.chromium.org/gerrit/48608
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Tested-by: Daniel Kurtz <djkurtz@chromium.org>
Commit-Queue: Daniel Kurtz <djkurtz@chromium.org>
drivers/base/Kconfig
drivers/base/dma-buf.c
drivers/gpu/drm/exynos/Kconfig
include/linux/dma-buf.h