diff options
| author | Colin Cross | 2014-02-17 22:58:32 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-02-18 20:03:28 +0100 |
| commit | 64907b94dab947f3f3fc96fe1ab810cbc12ca902 (patch) | |
| tree | 88bc4d2dd7b421dd712c8ba8b06f73ae75a2a3f6 /drivers/staging/android/sw_sync.h | |
| parent | staging: android: Split uapi out of ashmem.h (diff) | |
| download | kernel-qcow2-linux-64907b94dab947f3f3fc96fe1ab810cbc12ca902.tar.gz kernel-qcow2-linux-64907b94dab947f3f3fc96fe1ab810cbc12ca902.tar.xz kernel-qcow2-linux-64907b94dab947f3f3fc96fe1ab810cbc12ca902.zip | |
staging: android: split uapi out of sync.h and sw_sync.h
Move the userspace interfaces of sync.h and sw_sync.h to
drivers/staging/android/uapi/
Cc: Greg KH <gregkh@linuxfoundation.org>
Cc: Colin Cross <ccross@android.com>
Cc: Android Kernel Team <kernel-team@android.com>
Signed-off-by: Colin Cross <ccross@android.com>
[jstultz: Fixed up some conflicts from upstream spelling fixes]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/sw_sync.h')
| -rw-r--r-- | drivers/staging/android/sw_sync.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/drivers/staging/android/sw_sync.h b/drivers/staging/android/sw_sync.h index 5aaf71d6974b..1a50669ec8a9 100644 --- a/drivers/staging/android/sw_sync.h +++ b/drivers/staging/android/sw_sync.h @@ -18,10 +18,9 @@ #define _LINUX_SW_SYNC_H #include <linux/types.h> - -#ifdef __KERNEL__ - +#include <linux/kconfig.h> #include "sync.h" +#include "uapi/sw_sync.h" struct sw_sync_timeline { struct sync_timeline obj; @@ -57,19 +56,4 @@ static inline struct sync_pt *sw_sync_pt_create(struct sw_sync_timeline *obj, } #endif /* IS_ENABLED(CONFIG_SW_SYNC) */ -#endif /* __KERNEL __ */ - -struct sw_sync_create_fence_data { - __u32 value; - char name[32]; - __s32 fence; /* fd of new fence */ -}; - -#define SW_SYNC_IOC_MAGIC 'W' - -#define SW_SYNC_IOC_CREATE_FENCE _IOWR(SW_SYNC_IOC_MAGIC, 0,\ - struct sw_sync_create_fence_data) -#define SW_SYNC_IOC_INC _IOW(SW_SYNC_IOC_MAGIC, 1, __u32) - - #endif /* _LINUX_SW_SYNC_H */ |