rk: revert to v3.10

[firefly-linux-kernel-4.4.55.git] / arch / um / os-Linux / process.c

diff --git a/arch/um/os-Linux/process.c b/arch/um/os-Linux/process.c
index 67b9c8f5a89e95c261faea9a136f933cf7a46e05..b8f34c9e53ae9fc820f81e215253ec2bc70f9ffc 100644 (file)
--- a/arch/um/os-Linux/process.c
+++ b/arch/um/os-Linux/process.c
@@ -4,7 +4,6 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <signal.h>
@@ -233,57 +232,6 @@ out:
        return ok;
 }
 
-static int os_page_mincore(void *addr)
-{
-       char vec[2];
-       int ret;
-
-       ret = mincore(addr, UM_KERN_PAGE_SIZE, vec);
-       if (ret < 0) {
-               if (errno == ENOMEM || errno == EINVAL)
-                       return 0;
-               else
-                       return -errno;
-       }
-
-       return vec[0] & 1;
-}
-
-int os_mincore(void *addr, unsigned long len)
-{
-       char *vec;
-       int ret, i;
-
-       if (len <= UM_KERN_PAGE_SIZE)
-               return os_page_mincore(addr);
-
-       vec = calloc(1, (len + UM_KERN_PAGE_SIZE - 1) / UM_KERN_PAGE_SIZE);
-       if (!vec)
-               return -ENOMEM;
-
-       ret = mincore(addr, UM_KERN_PAGE_SIZE, vec);
-       if (ret < 0) {
-               if (errno == ENOMEM || errno == EINVAL)
-                       ret = 0;
-               else
-                       ret = -errno;
-
-               goto out;
-       }
-
-       for (i = 0; i < ((len + UM_KERN_PAGE_SIZE - 1) / UM_KERN_PAGE_SIZE); i++) {
-               if (!(vec[i] & 1)) {
-                       ret = 0;
-                       goto out;
-               }
-       }
-
-       ret = 1;
-out:
-       free(vec);
-       return ret;
-}
-
 void init_new_thread_signals(void)
 {
        set_handler(SIGSEGV);