diff options
| author | Olof Johansson <olof@lixom.net> | 2017-05-18 23:54:47 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-05-18 23:54:47 -0700 |
| commit | 5252d73756f318f182f2316acd78a6532041414d (patch) | |
| tree | b082478fca4f00f599bb2ed1547b2652c2bea155 /drivers/tee | |
| parent | e84188852a7239d7a144af12f7e5dac8fa88600b (diff) | |
| parent | 2ea659a9ef488125eb46da6eb571de5eae5c43f6 (diff) | |
Merge tag 'v4.12-rc1' into fixes
We've received a few fixes branches with -rc1 as base, but our contents was
still at pre-rc1. Merge it in expliticly to make 'git merge --log' clear on
hat was actually merged.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/tee')
| -rw-r--r-- | drivers/tee/tee_shm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 0be1e3e93bee..d356d7f025eb 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -61,12 +61,12 @@ static void tee_shm_op_release(struct dma_buf *dmabuf) tee_shm_release(shm); } -static void *tee_shm_op_kmap_atomic(struct dma_buf *dmabuf, unsigned long pgnum) +static void *tee_shm_op_map_atomic(struct dma_buf *dmabuf, unsigned long pgnum) { return NULL; } -static void *tee_shm_op_kmap(struct dma_buf *dmabuf, unsigned long pgnum) +static void *tee_shm_op_map(struct dma_buf *dmabuf, unsigned long pgnum) { return NULL; } @@ -84,8 +84,8 @@ static struct dma_buf_ops tee_shm_dma_buf_ops = { .map_dma_buf = tee_shm_op_map_dma_buf, .unmap_dma_buf = tee_shm_op_unmap_dma_buf, .release = tee_shm_op_release, - .kmap_atomic = tee_shm_op_kmap_atomic, - .kmap = tee_shm_op_kmap, + .map_atomic = tee_shm_op_map_atomic, + .map = tee_shm_op_map, .mmap = tee_shm_op_mmap, }; |