ion: move into staging

Move ion from drivers/gpu/ion to drivers/android/staging/ion.

Change-Id: Id6e996aa3954cbb8e1a8abc9578a56204f5eb211
Signed-off-by: Colin Cross <ccross@android.com>

drivers/gpu/Makefile

@@ -1,2 +1,2 @@
-obj-y			+= drm/ vga/ ion/
+obj-y			+= drm/ vga/
 obj-$(CONFIG_TEGRA_HOST1X)	+= host1x/

drivers/staging/android/Kconfig

@@ -108,6 +108,8 @@ config SW_SYNC_USER
 	  *WARNING* improper use of this can result in deadlocking kernel
 	  drivers from userspace.
 
+source "drivers/staging/android/ion/Kconfig"
+
 endif # if ANDROID
 
 endmenu

drivers/staging/android/Makefile

@@ -1,5 +1,7 @@
 ccflags-y += -I$(src)			# needed for trace events
 
+obj-y					+= ion/
+
 obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o
 obj-$(CONFIG_ASHMEM)			+= ashmem.o
 obj-$(CONFIG_ANDROID_LOGGER)		+= logger.o

drivers/staging/android/ion/compat_ion.c

@@ -14,14 +14,14 @@
  *
  */
 
-#include <linux/ion.h>
 #include <linux/compat.h>
 #include <linux/fs.h>
 #include <linux/uaccess.h>
 
+#include "ion.h"
 #include "compat_ion.h"
 
-/* See include/linux/ion.h for the definition of these structs */
+/* See drivers/staging/android/uapi/ion.h for the definition of these structs */
 struct compat_ion_allocation_data {
 	compat_size_t len;
 	compat_size_t align;

drivers/staging/android/ion/ion.c

@@ -20,7 +20,6 @@
 #include <linux/freezer.h>
 #include <linux/fs.h>
 #include <linux/anon_inodes.h>
-#include <linux/ion.h>
 #include <linux/kthread.h>
 #include <linux/list.h>
 #include <linux/memblock.h>
@@ -37,6 +36,7 @@
 #include <linux/dma-buf.h>
 #include <linux/idr.h>
 
+#include "ion.h"
 #include "ion_priv.h"
 #include "compat_ion.h"
 

drivers/staging/android/ion/ion.h

@@ -1,5 +1,5 @@
 /*
- * include/linux/ion.h
+ * drivers/staging/android/ion/ion.h
  *
  * Copyright (C) 2011 Google, Inc.
  *

drivers/staging/android/ion/ion_carveout_heap.c

@@ -18,11 +18,11 @@
 #include <linux/err.h>
 #include <linux/genalloc.h>
 #include <linux/io.h>
-#include <linux/ion.h>
 #include <linux/mm.h>
 #include <linux/scatterlist.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include "ion.h"
 #include "ion_priv.h"
 
 #include <asm/mach/map.h>

drivers/staging/android/ion/ion_chunk_heap.c

@@ -18,11 +18,11 @@
 #include <linux/err.h>
 #include <linux/genalloc.h>
 #include <linux/io.h>
-#include <linux/ion.h>
 #include <linux/mm.h>
 #include <linux/scatterlist.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include "ion.h"
 #include "ion_priv.h"
 
 #include <asm/mach/map.h>

drivers/staging/android/ion/ion_cma_heap.c

@@ -16,13 +16,12 @@
  */
 
 #include <linux/device.h>
-#include <linux/ion.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <linux/dma-mapping.h>
 
-/* for ion_heap_ops structure */
+#include "ion.h"
 #include "ion_priv.h"
 
 #define ION_CMA_ALLOCATE_FAILED -1

drivers/staging/android/ion/ion_heap.c

@@ -16,13 +16,13 @@
 
 #include <linux/err.h>
 #include <linux/freezer.h>
-#include <linux/ion.h>
 #include <linux/kthread.h>
 #include <linux/mm.h>
 #include <linux/rtmutex.h>
 #include <linux/sched.h>
 #include <linux/scatterlist.h>
 #include <linux/vmalloc.h>
+#include "ion.h"
 #include "ion_priv.h"
 
 void *ion_heap_map_kernel(struct ion_heap *heap,

drivers/staging/android/ion/ion_priv.h

@@ -17,7 +17,6 @@
 #ifndef _ION_PRIV_H
 #define _ION_PRIV_H
 
-#include <linux/ion.h>
 #include <linux/kref.h>
 #include <linux/mm_types.h>
 #include <linux/mutex.h>
@@ -26,6 +25,8 @@
 #include <linux/shrinker.h>
 #include <linux/types.h>
 
+#include "ion.h"
+
 struct ion_buffer *ion_handle_buffer(struct ion_handle *handle);
 
 /**

drivers/staging/android/ion/ion_system_heap.c

@@ -18,12 +18,12 @@
 #include <linux/dma-mapping.h>
 #include <linux/err.h>
 #include <linux/highmem.h>
-#include <linux/ion.h>
 #include <linux/mm.h>
 #include <linux/scatterlist.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include "ion.h"
 #include "ion_priv.h"
 
 static unsigned int high_order_gfp_flags = (GFP_HIGHUSER | __GFP_ZERO |

drivers/staging/android/ion/tegra/tegra_ion.c

@@ -15,9 +15,9 @@
  */
 
 #include <linux/err.h>
-#include <linux/ion.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include "../ion.h"
 #include "../ion_priv.h"
 
 struct ion_device *idev;

drivers/video/Kconfig

@@ -23,8 +23,6 @@ source "drivers/gpu/drm/Kconfig"
 
 source "drivers/gpu/host1x/Kconfig"
 
-source "drivers/gpu/ion/Kconfig"
-
 config VGASTATE
        tristate
        default n