From 8fe5d1eace4ba3347471d6da58aa7c95e4f3b31f Mon Sep 17 00:00:00 2001
From: Mel Gorman <mel@csn.ul.ie>
Date: Thu, 19 Jul 2007 01:47:23 -0700
Subject: [PATCH] --- yaml --- r: 61535 b: refs/heads/master c:
 bb2d5ce16409efcdf94017a6b6fecd468226e29c h: refs/heads/master i:   61533:
 6b9b2b3f099f9eb1ba40d21b2bfc22736e614a62   61531:
 adac55d0672f9a75def2391c4bd02ea9b733e9eb   61527:
 9754efa2b4d757a4082b047586b6491b51c923f9   61519:
 021de10e9dbd4d191a5ace401692a81b2da37713   61503:
 46bc74b55a6e9132736d27e26689f17587237f21 v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/highmem.h | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 4c69247a8495..81d72d0be62d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79352894b28550ee0eee919149f57626ec1b3572
+refs/heads/master: bb2d5ce16409efcdf94017a6b6fecd468226e29c
diff --git a/trunk/include/linux/highmem.h b/trunk/include/linux/highmem.h
index 12c5e4e3135a..1fcb0033179e 100644
--- a/trunk/include/linux/highmem.h
+++ b/trunk/include/linux/highmem.h
@@ -102,21 +102,6 @@ __alloc_zeroed_user_highpage(gfp_t movableflags,
 }
 #endif
 
-/**
- * alloc_zeroed_user_highpage - Allocate a zeroed HIGHMEM page for a VMA
- * @vma: The VMA the page is to be allocated for
- * @vaddr: The virtual address the page will be inserted into
- *
- * This function will allocate a page for a VMA that the caller knows will
- * not be able to move in the future using move_pages() or reclaim. If it
- * is known that the page can move, use alloc_zeroed_user_highpage_movable
- */
-static inline struct page *
-alloc_zeroed_user_highpage(struct vm_area_struct *vma, unsigned long vaddr)
-{
-	return __alloc_zeroed_user_highpage(0, vma, vaddr);
-}
-
 /**
  * alloc_zeroed_user_highpage_movable - Allocate a zeroed HIGHMEM page for a VMA that the caller knows can move
  * @vma: The VMA the page is to be allocated for