Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f65aa89 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Greg Kroah-Hartman
Browse files

staging/android: make sw_ioctl info internal to sw_sync.c 



We don't want to export this from the kernel. This is interface is only
for testing and debug. So testers shall copy the ioctl info in their own
projects.

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent aff9da10

drivers/staging/android/sw_sync.c

+12 −1
Original line number Diff line number Diff line
@@ -20,12 +20,23 @@ 
#include <linux/slab.h>

#include <linux/sync_file.h>



#include "uapi/sw_sync.h"

#include "sync.h"



#define CREATE_TRACE_POINTS

#include "trace/sync.h"



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)



static const struct fence_ops timeline_fence_ops;



static inline struct sync_pt *fence_to_sync_pt(struct fence *fence)

drivers/staging/android/uapi/sw_sync.h

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 Google, Inc.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#ifndef _UAPI_LINUX_SW_SYNC_H

#define _UAPI_LINUX_SW_SYNC_H



#include <linux/types.h>



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 /* _UAPI_LINUX_SW_SYNC_H */