Revert "pmem: Add cache flush ioctl for pmem buffers"

This reverts commit f6320db51173e3b94f54b87944b88d3b363c4487.

diff --git a/drivers/misc/pmem.c b/drivers/misc/pmem.c
index 7f3b532175604599484fd39def2115320abc8ba9..55c4de81b177d9a318ca55410c8c8cdb7e748780 100644 (file)
--- a/drivers/misc/pmem.c
+++ b/drivers/misc/pmem.c
@@ -1148,16 +1148,6 @@ static long pmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                DLOG("connect\n");
                return pmem_connect(arg, file);
                break;
-       case PMEM_CACHE_FLUSH:
-               {
-                       struct pmem_region region;
-                       DLOG("flush\n");
-                       if (copy_from_user(&region, (void __user *)arg,
-                                          sizeof(struct pmem_region)))
-                               return -EFAULT;
-                       flush_pmem_file(file, region.offset, region.len);
-                       break;
-               }
        default:
                if (pmem[id].ioctl)
                        return pmem[id].ioctl(file, cmd, arg);

diff --git a/include/linux/android_pmem.h b/include/linux/android_pmem.h
index f633621f5be3db3b9021bc0f040cd255670b619d..398997c3386ba0117c9774418d68e829b1bb395d 100644 (file)
--- a/include/linux/android_pmem.h
+++ b/include/linux/android_pmem.h
@@ -33,7 +33,6 @@
  * struct (with offset set to 0). 
  */
 #define PMEM_GET_TOTAL_SIZE    _IOW(PMEM_IOCTL_MAGIC, 7, unsigned int)
-#define PMEM_CACHE_FLUSH       _IOW(PMEM_IOCTL_MAGIC, 8, unsigned int)
 
 struct android_pmem_platform_data
 {