diff options
| author | Rom Lemarchand <romlem@google.com> | 2013-10-22 13:28:23 -0700 |
|---|---|---|
| committer | Rom Lemarchand <romlem@google.com> | 2013-10-23 15:24:42 -0700 |
| commit | 0bfe504b8ab5b626a13bba02d397579dc9393e3b (patch) | |
| tree | ff2835e336e2ff5079c0a129ccfe0c96c920e0ba | |
| parent | 88aabcda910c60b5ff0c9b0609b15e308ac4108d (diff) | |
| download | msm8960-0bfe504b8ab5b626a13bba02d397579dc9393e3b.tar.gz | |
msm8960: add new device-specific ion headers
Add device-specific ion headers to prevent namespace collisions
Change-Id: I1eaeceedcaf6502cae15a0c353d3347c4fa609f2
| -rw-r--r-- | kernel-headers/linux/ion.h | 28 | ||||
| -rw-r--r-- | original-kernel-headers/linux/ion.h | 9 |
2 files changed, 19 insertions, 18 deletions
diff --git a/kernel-headers/linux/ion.h b/kernel-headers/linux/ion.h index f40abd0..72c2173 100644 --- a/kernel-headers/linux/ion.h +++ b/kernel-headers/linux/ion.h @@ -22,54 +22,54 @@ #include <linux/types.h> /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct ion_handle; +typedef struct ion_handle *ion_user_handle_t; enum ion_heap_type { ION_HEAP_TYPE_SYSTEM, - ION_HEAP_TYPE_SYSTEM_CONTIG, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + ION_HEAP_TYPE_SYSTEM_CONTIG, ION_HEAP_TYPE_CARVEOUT, ION_HEAP_TYPE_DMA, ION_HEAP_TYPE_CUSTOM, - ION_NUM_HEAPS = 16, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + ION_NUM_HEAPS = 16, }; #define ION_HEAP_SYSTEM_MASK (1 << ION_HEAP_TYPE_SYSTEM) #define ION_HEAP_SYSTEM_CONTIG_MASK (1 << ION_HEAP_TYPE_SYSTEM_CONTIG) -#define ION_HEAP_CARVEOUT_MASK (1 << ION_HEAP_TYPE_CARVEOUT) /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define ION_HEAP_CARVEOUT_MASK (1 << ION_HEAP_TYPE_CARVEOUT) #define ION_HEAP_TYPE_DMA_MASK (1 << ION_HEAP_TYPE_DMA) #define ION_FLAG_CACHED 1 struct ion_allocation_data { - size_t len; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + size_t len; size_t align; - unsigned int heap_mask; + unsigned int heap_id_mask; unsigned int flags; - struct ion_handle *handle; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + ion_user_handle_t handle; }; struct ion_fd_data { - struct ion_handle *handle; - int fd; + ion_user_handle_t handle; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + int fd; }; struct ion_handle_data { - struct ion_handle *handle; -}; + ion_user_handle_t handle; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +}; struct ion_custom_data { unsigned int cmd; unsigned long arg; -}; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +}; #define ION_IOC_MAGIC 'I' #define ION_IOC_ALLOC _IOWR(ION_IOC_MAGIC, 0, struct ion_allocation_data) #define ION_IOC_FREE _IOWR(ION_IOC_MAGIC, 1, struct ion_handle_data) -#define ION_IOC_MAP _IOWR(ION_IOC_MAGIC, 2, struct ion_fd_data) /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define ION_IOC_MAP _IOWR(ION_IOC_MAGIC, 2, struct ion_fd_data) #define ION_IOC_SHARE _IOWR(ION_IOC_MAGIC, 4, struct ion_fd_data) #define ION_IOC_IMPORT _IOWR(ION_IOC_MAGIC, 5, struct ion_fd_data) #define ION_IOC_CUSTOM _IOWR(ION_IOC_MAGIC, 6, struct ion_custom_data) -#define ION_IOC_SYNC _IOWR(ION_IOC_MAGIC, 7, struct ion_fd_data) /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define ION_IOC_SYNC _IOWR(ION_IOC_MAGIC, 7, struct ion_fd_data) #endif - diff --git a/original-kernel-headers/linux/ion.h b/original-kernel-headers/linux/ion.h index e94bf75..b958155 100644 --- a/original-kernel-headers/linux/ion.h +++ b/original-kernel-headers/linux/ion.h @@ -22,6 +22,7 @@ #include <linux/types.h> struct ion_handle; +typedef struct ion_handle *ion_user_handle_t; /** * enum ion_heap_types - list of all possible types of heaps * @ION_HEAP_TYPE_SYSTEM: memory allocated via vmalloc @@ -512,9 +513,9 @@ static inline int msm_ion_do_cache_op(struct ion_client *client, struct ion_allocation_data { size_t len; size_t align; - unsigned int heap_mask; + unsigned int heap_id_mask; unsigned int flags; - struct ion_handle *handle; + ion_user_handle_t handle; }; /** @@ -528,7 +529,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; }; @@ -537,7 +538,7 @@ struct ion_fd_data { * @handle: a handle */ struct ion_handle_data { - struct ion_handle *handle; + ion_user_handle_t handle; }; /** |