diff options
| author | Luden <luden@ghostmail.com> | 2016-01-30 01:07:26 +0100 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-05-01 23:35:54 +0200 |
| commit | 0ff6b8dd50f90858213cca674a1865b2b6c7391f (patch) | |
| tree | 530eb344e15c1102e9750d91f6d6f4d69d27d85c /include | |
| parent | 980a74e2c46a5f8b8ae8ef4e73dbcc4bf26443b9 (diff) | |
| download | kernel_samsung_tuna-0ff6b8dd50f90858213cca674a1865b2b6c7391f.zip kernel_samsung_tuna-0ff6b8dd50f90858213cca674a1865b2b6c7391f.tar.gz kernel_samsung_tuna-0ff6b8dd50f90858213cca674a1865b2b6c7391f.tar.bz2 | |
OMAP: switch Ducati allocations to CMA
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/omap_ion.h | 6 | ||||
| -rw-r--r-- | include/linux/remoteproc.h | 2 | ||||
| -rw-r--r-- | include/linux/rpmsg.h | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/omap_ion.h b/include/linux/omap_ion.h index 81c73e2..2fd3a09 100644 --- a/include/linux/omap_ion.h +++ b/include/linux/omap_ion.h @@ -56,6 +56,12 @@ int omap_ion_share_fd_to_buffers(int fd, struct ion_buffer **buffers, int omap_tiler_vinfo(struct ion_client *client, struct ion_handle *handle, unsigned int *vstride, unsigned int *vsize); +#ifdef CONFIG_CMA +bool omap_ion_ipu_allocate_memory(void); +bool omap_ion_ipu_free_memory(void); +bool omap_ion_rpmsg_allocate_memory(void); +bool omap_ion_rpmsg_free_memory(void); +#endif #endif /* __KERNEL__ */ /* additional heaps used only on omap */ diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index cd0105d..d8ca826 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -270,7 +270,7 @@ struct rproc { int cdump_len0, cdump_len1; struct mutex tlock; struct completion firmware_loading_complete; - struct work_struct error_work; + struct work_struct error_work, unload_work; struct blocking_notifier_head nbh; struct completion error_comp; #ifdef CONFIG_REMOTE_PROC_AUTOSUSPEND diff --git a/include/linux/rpmsg.h b/include/linux/rpmsg.h index 1f7ba09..4bc3abc 100644 --- a/include/linux/rpmsg.h +++ b/include/linux/rpmsg.h @@ -146,6 +146,7 @@ void rpmsg_destroy_ept(struct rpmsg_endpoint *); struct rpmsg_endpoint *rpmsg_create_ept(struct rpmsg_channel *, void (*cb)(struct rpmsg_channel *, void *, int, void *, u32), void *priv, u32 addr); +void rpmsg_reset_all_devices(void); int rpmsg_send_offchannel_raw(struct rpmsg_channel *, u32, u32, void *, int, bool); |