staging: sync: make sync independent of android

Until now Android Sync framework was being used only in Android,
however, it can be used in Linux too as it provides a generic
synchronization framework. Hence removing Sync framework's dependency
on Android.

bug 1543760
bug 1601262

Change-Id: Ia3c21f0171d0147d0a035ff02c0673b63eced54e
Signed-off-by: Naveen Kumar S <nkumars@nvidia.com>
Reviewed-on: http://git-master/r/714736
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index e213eec10d2759181cca90cde7b8423338b979e4..a0e24e765d8920b82b7053144f449aa94bff0536 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -50,6 +50,7 @@ obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217)     += cptm1217/
 obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4)   += ste_rmi4/
 obj-$(CONFIG_MFD_NVEC)         += nvec/
 obj-$(CONFIG_ANDROID)          += android/
+obj-$(CONFIG_SYNC)             += android/
 obj-$(CONFIG_USB_WPAN_HCD)     += ozwpan/
 obj-$(CONFIG_WIMAX_GDM72XX)    += gdm72xx/
 obj-$(CONFIG_CSR_WIFI)         += csr/

diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index c303acbe05cc2c3126e37dd0ab2f454e050fbada..c93816fc7beccced9ae14226dbe3bf42d61d8c84 100644 (file)
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -98,37 +98,37 @@ config ANDROID_INTF_ALARM_DEV
          elapsed realtime, and a non-wakeup alarm on the monotonic clock.
          Also exports the alarm interface to user-space.
 
-config SYNC
-       bool "Synchronization framework"
-       default n
-       select ANON_INODES
-       help
-         This option enables the framework for synchronization between multiple
-         drivers.  Sync implementations can take advantage of hardware
-         synchronization built into devices like GPUs.
-
-config SW_SYNC
-       bool "Software synchronization objects"
-       default n
-       depends on SYNC
-       help
-         A sync object driver that uses a 32bit counter to coordinate
-         syncrhronization.  Useful when there is no hardware primitive backing
-         the synchronization.
-
-config SW_SYNC_USER
-       bool "Userspace API for SW_SYNC"
-       default n
-       depends on SW_SYNC
-       help
-         Provides a user space API to the sw sync object.
-         *WARNING* improper use of this can result in deadlocking kernel
-         drivers from userspace.
-
 source "drivers/staging/android/ion/Kconfig"
 
 source "drivers/staging/android/fiq_debugger/Kconfig"
 
 endif # if ANDROID
 
+config SYNC
+        bool "Synchronization framework"
+        default n
+        select ANON_INODES
+        help
+          This option enables the framework for synchronization between multiple
+          drivers.  Sync implementations can take advantage of hardware
+          synchronization built into devices like GPUs.
+
+config SW_SYNC
+        bool "Software synchronization objects"
+        default n
+        depends on SYNC
+        help
+          A sync object driver that uses a 32bit counter to coordinate
+          syncrhronization.  Useful when there is no hardware primitive backing
+          the synchronization.
+
+config SW_SYNC_USER
+        bool "Userspace API for SW_SYNC"
+        default n
+        depends on SW_SYNC
+        help
+          Provides a user space API to the sw sync object.
+          *WARNING* improper use of this can result in deadlocking kernel
+          drivers from userspace.
+
 endmenu