diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-11-04 14:48:40 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-11-04 14:48:40 -0800 |
| commit | 354d86f4daecdc3553830e553f6fc17add736234 (patch) | |
| tree | f486e22499fc5ce7548b76f299ecb91f52baf8ed /include/linux | |
| parent | a4b2b620070eb156f75c7d4b276e1acd8b7b3040 (diff) | |
| parent | b38c6f06915c69424abb85fbd5c16e418865ed9b (diff) | |
Merge branch 'linaro-fixes/android-3.10' into linaro-android.3.10-lsk
Merge "official" android-3.10 branch in w/ older experimental/android-3.10
to update lsk targetted branch to the official branch w/o any rebase trouble.
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ion.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/ion.h b/include/linux/ion.h index 440f4b3b0a4..5771f8c3d3a 100644 --- a/include/linux/ion.h +++ b/include/linux/ion.h @@ -19,7 +19,8 @@ #include <linux/types.h> -struct ion_handle; +typedef int ion_user_handle_t; + /** * enum ion_heap_types - list of all possible types of heaps * @ION_HEAP_TYPE_SYSTEM: memory allocated via vmalloc @@ -63,6 +64,7 @@ enum ion_heap_type { caches must be managed manually */ #ifdef __KERNEL__ +struct ion_handle; struct ion_device; struct ion_heap; struct ion_mapper; @@ -268,7 +270,7 @@ struct ion_allocation_data { size_t align; unsigned int heap_id_mask; unsigned int flags; - struct ion_handle *handle; + ion_user_handle_t handle; }; /** @@ -282,7 +284,7 @@ struct ion_allocation_data { * provides the file descriptor and the kernel returns the handle. */ struct ion_fd_data { - struct ion_handle *handle; + ion_user_handle_t handle; int fd; }; @@ -291,7 +293,7 @@ struct ion_fd_data { * @handle: a handle */ struct ion_handle_data { - struct ion_handle *handle; + ion_user_handle_t handle; }; /** |