From 699b7f43c2577924f459775e7fc6cfb0ea854ace Mon Sep 17 00:00:00 2001
From: Alex Shi <alex.shi@intel.com>
Date: Tue, 29 May 2012 15:06:31 -0700
Subject: [PATCH] --- yaml --- r: 308853 b: refs/heads/master c:
 2099597401c7710c00b0d7c32b24a44a193836e1 h: refs/heads/master i:   308851:
 5fe8c88cbc133b6c57c38d531b3a7eccb9fe057d v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/huge_mm.h | 2 ++
 trunk/include/linux/rmap.h    | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 04a711693f3d..6b468ebc8eaf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e30d539b3fe76f5bb71e069dcbfa47a1c2e6da3b
+refs/heads/master: 2099597401c7710c00b0d7c32b24a44a193836e1
diff --git a/trunk/include/linux/huge_mm.h b/trunk/include/linux/huge_mm.h
index c8af7a2efb52..4c59b1131187 100644
--- a/trunk/include/linux/huge_mm.h
+++ b/trunk/include/linux/huge_mm.h
@@ -59,6 +59,8 @@ extern pmd_t *page_check_address_pmd(struct page *page,
 #define HPAGE_PMD_MASK HPAGE_MASK
 #define HPAGE_PMD_SIZE HPAGE_SIZE
 
+extern bool is_vma_temporary_stack(struct vm_area_struct *vma);
+
 #define transparent_hugepage_enabled(__vma)				\
 	((transparent_hugepage_flags &					\
 	  (1<<TRANSPARENT_HUGEPAGE_FLAG) ||				\
diff --git a/trunk/include/linux/rmap.h b/trunk/include/linux/rmap.h
index fd07c4542cee..3fce545df394 100644
--- a/trunk/include/linux/rmap.h
+++ b/trunk/include/linux/rmap.h
@@ -173,8 +173,6 @@ enum ttu_flags {
 };
 #define TTU_ACTION(x) ((x) & TTU_ACTION_MASK)
 
-bool is_vma_temporary_stack(struct vm_area_struct *vma);
-
 int try_to_unmap(struct page *, enum ttu_flags flags);
 int try_to_unmap_one(struct page *, struct vm_area_struct *,
 			unsigned long address, enum ttu_flags flags);