Update original headers for ion to kernel-headers
Change-Id: I0184fe22bc367942cc464de3b9ee146bbd648321
Signed-off-by: Iliyan Malchev <malchev@google.com>
diff --git a/original/linux/ion.h b/original/linux/ion.h
index 4282315..111982f 100644
--- a/original/linux/ion.h
+++ b/original/linux/ion.h
@@ -22,12 +22,12 @@
struct ion_handle;
/**
* enum ion_heap_types - list of all possible types of heaps
- * @ION_HEAP_SYSTEM: memory allocated via vmalloc
- * @ION_HEAP_SYSTEM_CONTIG: memory allocated via kmalloc
- * @ION_HEAP_CARVEOUT: memory allocated from a prereserved
- * carveout heap, allocations are physically
- * contiguous
- * @ION_HEAP_END: helper for iterating over heaps
+ * @ION_HEAP_TYPE_SYSTEM: memory allocated via vmalloc
+ * @ION_HEAP_TYPE_SYSTEM_CONTIG: memory allocated via kmalloc
+ * @ION_HEAP_TYPE_CARVEOUT: memory allocated from a prereserved
+ * carveout heap, allocations are physically
+ * contiguous
+ * @ION_HEAP_END: helper for iterating over heaps
*/
enum ion_heap_type {
ION_HEAP_TYPE_SYSTEM,
@@ -38,9 +38,9 @@
ION_NUM_HEAPS,
};
-#define ION_HEAP_SYSTEM_MASK (1 << ION_HEAP_SYSTEM)
-#define ION_HEAP_SYSTEM_CONTIG_MASK (1 << ION_HEAP_SYSTEM_CONTIG)
-#define ION_HEAP_CARVEOUT_MASK (1 << ION_HEAP_CARVEOUT)
+#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)
#ifdef __KERNEL__
struct ion_device;
diff --git a/original/linux/omap_ion.h b/original/linux/omap_ion.h
index 87be35f..ba505eb 100644
--- a/original/linux/omap_ion.h
+++ b/original/linux/omap_ion.h
@@ -47,13 +47,14 @@
/* given a handle in the tiler, return a list of tiler pages that back it */
int omap_tiler_pages(struct ion_client *client, struct ion_handle *handle,
int *n, u32 ** tiler_pages);
+#endif /* __KERNEL__ */
+
/* additional heaps used only on omap */
enum {
OMAP_ION_HEAP_TYPE_TILER = ION_HEAP_TYPE_CUSTOM + 1,
};
-#endif /* __KERNEL__ */
-#define OMAP_ION_HEAP_TILER_MASK (1 << ION_HEAP_OMAP_TILER)
+#define OMAP_ION_HEAP_TILER_MASK (1 << OMAP_ION_HEAP_TYPE_TILER)
enum {
OMAP_ION_TILER_ALLOC,