---

yaml --- r: 272161 b: refs/heads/master c: 2f1da64 h: refs/heads/master i: 272159: 0cc1f87 v: v3
git-mirror · Nov 1, 2011 · d8b70a3 · d8b70a3
1 parent 1dbce72
commit d8b70a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e754d79d35f0b8612445a9bd7491c48d7317e3ad
+refs/heads/master: 2f1da6421570d064a94e17190a4955c2df99794d
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
@@ -89,7 +89,8 @@ struct khugepaged_scan {
 	struct list_head mm_head;
 	struct mm_slot *mm_slot;
 	unsigned long address;
-} khugepaged_scan = {
+};
+static struct khugepaged_scan khugepaged_scan = {
 	.mm_head = LIST_HEAD_INIT(khugepaged_scan.mm_head),
 };
 
@@ -2069,6 +2070,8 @@ static void collect_mm_slot(struct mm_slot *mm_slot)
 
 static unsigned int khugepaged_scan_mm_slot(unsigned int pages,
 					    struct page **hpage)
+	__releases(&khugepaged_mm_lock)
+	__acquires(&khugepaged_mm_lock)
 {
 	struct mm_slot *mm_slot;
 	struct mm_struct *mm;