summaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorNaveen Kumar S <nkumars@nvidia.com>2015-03-06 15:11:39 +0530
committerMatthew Pedro <mapedro@nvidia.com>2015-03-17 21:10:04 -0700
commit07491a7da2671c12200e45e7401a356eef064de0 (patch)
treecd5346249aea0ea488b95cd0752e3e2ec2d5bef5 /drivers/staging
parent26514bb778680f0ade809182731fc77ed6c0fa7a (diff)
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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/Makefile1
-rw-r--r--drivers/staging/android/Kconfig54
2 files changed, 28 insertions, 27 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index e213eec10d27..a0e24e765d89 100644
--- 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 c303acbe05cc..c93816fc7bec 100644
--- 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