From a9dca77315b85f61e7386ca8dc931f79f6396531 Mon Sep 17 00:00:00 2001 From: Rebecca Schultz Zavin Date: Thu, 20 Sep 2012 00:17:34 -0700 Subject: [PATCH] Update ion header to add FLAG_CACHED_NEEDS_SYNC Bug: 6854979 Change-Id: Ic94c1b7b10ab750a6b4b0db83d2fb1fa073d91b9 Signed-off-by: Rebecca Schultz Zavin --- libc/kernel/common/linux/ion.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libc/kernel/common/linux/ion.h b/libc/kernel/common/linux/ion.h index aba44b385..ab4f49ff4 100644 --- a/libc/kernel/common/linux/ion.h +++ b/libc/kernel/common/linux/ion.h @@ -34,38 +34,39 @@ enum ion_heap_type { #define ION_HEAP_SYSTEM_CONTIG_MASK (1 << ION_HEAP_TYPE_SYSTEM_CONTIG) #define ION_HEAP_CARVEOUT_MASK (1 << ION_HEAP_TYPE_CARVEOUT) #define ION_FLAG_CACHED 1 -struct ion_allocation_data { +#define ION_FLAG_CACHED_NEEDS_SYNC 2 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +struct ion_allocation_data { size_t len; size_t align; unsigned int heap_mask; - unsigned int flags; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + unsigned int flags; struct ion_handle *handle; }; struct ion_fd_data { - struct ion_handle *handle; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + struct ion_handle *handle; int fd; }; struct ion_handle_data { - struct ion_handle *handle; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + struct ion_handle *handle; }; struct ion_custom_data { unsigned int cmd; - unsigned long arg; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + unsigned long arg; }; #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) /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#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) #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_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) #define ION_IOC_CUSTOM _IOWR(ION_IOC_MAGIC, 6, struct ion_custom_data) #endif -- 2.11.0