These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / android / uapi / ion.h

diff --git a/kernel/drivers/staging/android/uapi/ion.h b/kernel/drivers/staging/android/uapi/ion.h
index 6aa4956..0a8e40f 100644 (file)
--- a/kernel/drivers/staging/android/uapi/ion.h
+++ b/kernel/drivers/staging/android/uapi/ion.h
@@ -40,8 +40,10 @@ enum ion_heap_type {
        ION_HEAP_TYPE_CARVEOUT,
        ION_HEAP_TYPE_CHUNK,
        ION_HEAP_TYPE_DMA,
-       ION_HEAP_TYPE_CUSTOM, /* must be last so device specific heaps always
-                                are at the end of this enum */
+       ION_HEAP_TYPE_CUSTOM, /*
+                              * must be last so device specific heaps always
+                              * are at the end of this enum
+                              */
        ION_NUM_HEAPS = 16,
 };
 
@@ -56,13 +58,18 @@ enum ion_heap_type {
  * allocation flags - the lower 16 bits are used by core ion, the upper 16
  * bits are reserved for use by the heaps themselves.
  */
-#define ION_FLAG_CACHED 1              /* mappings of this buffer should be
-                                          cached, ion will do cache
-                                          maintenance when the buffer is
-                                          mapped for dma */
-#define ION_FLAG_CACHED_NEEDS_SYNC 2   /* mappings of this buffer will created
-                                          at mmap time, if this is set
-                                          caches must be managed manually */
+#define ION_FLAG_CACHED 1              /*
+                                        * mappings of this buffer should be
+                                        * cached, ion will do cache
+                                        * maintenance when the buffer is
+                                        * mapped for dma
+                                       */
+#define ION_FLAG_CACHED_NEEDS_SYNC 2   /*
+                                        * mappings of this buffer will created
+                                        * at mmap time, if this is set
+                                        * caches must be managed
+                                        * manually
+                                        */
 
 /**
  * DOC: Ion Userspace API
@@ -179,7 +186,7 @@ struct ion_custom_data {
  * DOC: ION_IOC_SYNC - syncs a shared file descriptors to memory
  *
  * Deprecated in favor of using the dma_buf api's correctly (syncing
- * will happend automatically when the buffer is mapped to a device).
+ * will happen automatically when the buffer is mapped to a device).
  * If necessary should be used after touching a cached buffer from the cpu,
  * this will make the buffer in memory coherent.
  */