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

Commit ff0156ec authored by Rebecca Schultz Zavin's avatar Rebecca Schultz Zavin Committed by Android Git Automerger
Browse files

am 0d699de0: Merge "Add explicit sync call to ion library" into jb-mr1-dev 

* commit '0d699de0':
  Add explicit sync call to ion library
parents 2a17b52c 0d699de0

include/ion/ion.h

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ int ion_alloc(int fd, size_t len, size_t align, unsigned int heap_mask, 
	      unsigned int flags, struct ion_handle **handle);

int ion_alloc_fd(int fd, size_t len, size_t align, unsigned int heap_mask,

		 unsigned int flags, int *handle_fd);

int ion_sync_fd(int fd, int handle_fd);

int ion_free(int fd, struct ion_handle *handle);

int ion_map(int fd, struct ion_handle *handle, size_t length, int prot,

            int flags, off_t offset, unsigned char **ptr, int *map_fd);

libion/ion.c

+8 −0
Original line number Diff line number Diff line
@@ -146,3 +146,11 @@ int ion_import(int fd, int share_fd, struct ion_handle **handle) 
        *handle = data.handle;

        return ret;

}



int ion_sync_fd(int fd, int handle_fd)

{

    struct ion_fd_data data = {

        .fd = handle_fd,

    };

    return ion_ioctl(fd, ION_IOC_SYNC, &data);

}