Revert "REVERT THIS BEFORE UPDATE ion: Rename heap_mask when used in …

…userspace" This reverts commit 6171df8. Change-Id: I985914b375cddb4a6e3b8c09f03b434d27aa1ac0
SlimRoms · Jan 15, 2015 · 4696250 · 4696250
1 parent 3047392
commit 4696250
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/include/linux/ion.h b/include/linux/ion.h
@@ -348,12 +348,7 @@ static inline int ion_handle_get_flags(struct ion_client *client,
 struct ion_allocation_data {
 	size_t len;
 	size_t align;
-#ifdef  __KERNEL__
 	unsigned int heap_mask;
-#else
-        /* Userspace wants this renamed... */
-	unsigned int heap_id_mask;
-#endif
 	unsigned int flags;
 	struct ion_handle *handle;
 };