From 6e5752ce0d0adb6d7b679ae551bac99d91d89c71 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Apr 2013 10:05:39 -0700
Subject: [PATCH] --- yaml --- r: 362712 b: refs/heads/master c:
 f86b11fbc772b5a4926855c6bc1ff3a3d99995a7 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/mtd/mtdchar.c | 27 ---------------------------
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index f75ff1bb8f2f..9736354d1b99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fe09a45c4848b5b5607b968d959fdc1821c161d
+refs/heads/master: f86b11fbc772b5a4926855c6bc1ff3a3d99995a7
diff --git a/trunk/drivers/mtd/mtdchar.c b/trunk/drivers/mtd/mtdchar.c
index 61a1b22c05e7..dc571ebc1aa0 100644
--- a/trunk/drivers/mtd/mtdchar.c
+++ b/trunk/drivers/mtd/mtdchar.c
@@ -1123,33 +1123,6 @@ static unsigned long mtdchar_get_unmapped_area(struct file *file,
 }
 #endif
 
-static inline unsigned long get_vm_size(struct vm_area_struct *vma)
-{
-	return vma->vm_end - vma->vm_start;
-}
-
-static inline resource_size_t get_vm_offset(struct vm_area_struct *vma)
-{
-	return (resource_size_t) vma->vm_pgoff << PAGE_SHIFT;
-}
-
-/*
- * Set a new vm offset.
- *
- * Verify that the incoming offset really works as a page offset,
- * and that the offset and size fit in a resource_size_t.
- */
-static inline int set_vm_offset(struct vm_area_struct *vma, resource_size_t off)
-{
-	pgoff_t pgoff = off >> PAGE_SHIFT;
-	if (off != (resource_size_t) pgoff << PAGE_SHIFT)
-		return -EINVAL;
-	if (off + get_vm_size(vma) - 1 < off)
-		return -EINVAL;
-	vma->vm_pgoff = pgoff;
-	return 0;
-}
-
 /*
  * set up a mapping for shared memory segments
  */