Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363266
b: refs/heads/master
c: 8edb4ad
h: refs/heads/master
v: v3
  • Loading branch information
Erik Gilling authored and Greg Kroah-Hartman committed Mar 4, 2013
1 parent affae78 commit cefd28a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c0f61a4e6145728153d0b94152b4dd5b06899b3b
refs/heads/master: 8edb4ad9118befafe6e0a6b7456939b74a545e42
14 changes: 14 additions & 0 deletions trunk/drivers/staging/android/sync.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

#include <linux/debugfs.h>
#include <linux/export.h>
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/kernel.h>
Expand Down Expand Up @@ -64,6 +65,7 @@ struct sync_timeline *sync_timeline_create(const struct sync_timeline_ops *ops,

return obj;
}
EXPORT_SYMBOL(sync_timeline_create);

static void sync_timeline_free(struct sync_timeline *obj)
{
Expand Down Expand Up @@ -94,6 +96,7 @@ void sync_timeline_destroy(struct sync_timeline *obj)
else
sync_timeline_signal(obj);
}
EXPORT_SYMBOL(sync_timeline_destroy);

static void sync_timeline_add_pt(struct sync_timeline *obj, struct sync_pt *pt)
{
Expand Down Expand Up @@ -152,6 +155,7 @@ void sync_timeline_signal(struct sync_timeline *obj)
sync_fence_signal_pt(pt);
}
}
EXPORT_SYMBOL(sync_timeline_signal);

struct sync_pt *sync_pt_create(struct sync_timeline *parent, int size)
{
Expand All @@ -169,6 +173,7 @@ struct sync_pt *sync_pt_create(struct sync_timeline *parent, int size)

return pt;
}
EXPORT_SYMBOL(sync_pt_create);

void sync_pt_free(struct sync_pt *pt)
{
Expand All @@ -179,6 +184,7 @@ void sync_pt_free(struct sync_pt *pt)

kfree(pt);
}
EXPORT_SYMBOL(sync_pt_free);

/* call with pt->parent->active_list_lock held */
static int _sync_pt_has_signaled(struct sync_pt *pt)
Expand Down Expand Up @@ -284,6 +290,7 @@ struct sync_fence *sync_fence_create(const char *name, struct sync_pt *pt)

return fence;
}
EXPORT_SYMBOL(sync_fence_create);

static int sync_fence_copy_pts(struct sync_fence *dst, struct sync_fence *src)
{
Expand Down Expand Up @@ -331,16 +338,19 @@ struct sync_fence *sync_fence_fdget(int fd)
fput(file);
return NULL;
}
EXPORT_SYMBOL(sync_fence_fdget);

void sync_fence_put(struct sync_fence *fence)
{
fput(fence->file);
}
EXPORT_SYMBOL(sync_fence_put);

void sync_fence_install(struct sync_fence *fence, int fd)
{
fd_install(fd, fence->file);
}
EXPORT_SYMBOL(sync_fence_install);

static int sync_fence_get_status(struct sync_fence *fence)
{
Expand Down Expand Up @@ -388,6 +398,7 @@ struct sync_fence *sync_fence_merge(const char *name,
kfree(fence);
return NULL;
}
EXPORT_SYMBOL(sync_fence_merge);

static void sync_fence_signal_pt(struct sync_pt *pt)
{
Expand Down Expand Up @@ -447,6 +458,7 @@ int sync_fence_wait_async(struct sync_fence *fence,

return err;
}
EXPORT_SYMBOL(sync_fence_wait_async);

int sync_fence_cancel_async(struct sync_fence *fence,
struct sync_fence_waiter *waiter)
Expand Down Expand Up @@ -475,6 +487,7 @@ int sync_fence_cancel_async(struct sync_fence *fence,
spin_unlock_irqrestore(&fence->waiter_list_lock, flags);
return ret;
}
EXPORT_SYMBOL(sync_fence_cancel_async);

int sync_fence_wait(struct sync_fence *fence, long timeout)
{
Expand All @@ -500,6 +513,7 @@ int sync_fence_wait(struct sync_fence *fence, long timeout)

return 0;
}
EXPORT_SYMBOL(sync_fence_wait);

static int sync_fence_release(struct inode *inode, struct file *file)
{
Expand Down

0 comments on commit cefd28a

Please sign in to comment.