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

Commit 9a55ab01 authored by Stephen Boyd's avatar Stephen Boyd Committed by Matt Wagantall
Browse files

Move sync.h from staging into include/linux 



The kgsl driver needs this to compile (or we could use .. but
this is easier).

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Cherry-picked from a0ab343c58f2412011ff2d544d2ef59a016f934c
[joshc: Handled sw_sync uapi split, move uapi component out of
drivers/staging]
Signed-off-by: default avatarJosh Cartwright <joshc@codeaurora.org>
parent db45b196

drivers/staging/android/sw_sync.c

+1 −2
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ 
#include <linux/module.h>

#include <linux/syscalls.h>

#include <linux/uaccess.h>



#include "sw_sync.h"

#include <linux/sw_sync.h>



static int sw_sync_cmp(u32 a, u32 b)

{

drivers/staging/android/sync.c

+1 −2
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ 
#include <linux/slab.h>

#include <linux/uaccess.h>

#include <linux/anon_inodes.h>



#include "sync.h"

#include <linux/sync.h>



#define CREATE_TRACE_POINTS

#include "trace/sync.h"

drivers/staging/android/trace/sync.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_SYNC_H



#include "../sync.h"

#include <linux/sync.h>

#include <linux/tracepoint.h>



TRACE_EVENT(sync_timeline,

drivers/staging/android/sw_sync.h→include/linux/sw_sync.h

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 


#include <linux/types.h>

#include <linux/kconfig.h>

#include "sync.h"

#include "uapi/sw_sync.h"

#include <linux/sync.h>

#include <uapi/linux/sw_sync.h>



struct sw_sync_timeline {

	struct	sync_timeline	obj;

drivers/staging/android/sync.h→include/linux/sync.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <linux/wait.h>

#include <linux/fence.h>



#include "uapi/sync.h"

#include <uapi/linux/sync.h>



struct sync_timeline;

struct sync_pt;