---

yaml --- r: 356615 b: refs/heads/master c: b21e0b9 h: refs/heads/master i: 356613: 984c929 356611: be06736 356607: 818a787 v: v3
git-mirror · Feb 24, 2013 · f89568d · f89568d
1 parent 877283c
commit f89568d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 697ce9be7d5c78d6a53dee15f5574f7398cba05c
+refs/heads/master: b21e0b90ccb99a377bce0167fed1e881bb5065d7
diff --git a/trunk/include/linux/swap.h b/trunk/include/linux/swap.h
@@ -275,7 +275,7 @@ extern unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem,
 extern unsigned long shrink_all_memory(unsigned long nr_pages);
 extern int vm_swappiness;
 extern int remove_mapping(struct address_space *mapping, struct page *page);
-extern long vm_total_pages;
+extern unsigned long vm_total_pages;
 
 #ifdef CONFIG_NUMA
 extern int zone_reclaim_mode;

diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
@@ -128,7 +128,7 @@ struct scan_control {
  * From 0 .. 100.  Higher means more swappy.
  */
 int vm_swappiness = 60;
-long vm_total_pages;	/* The total number of pages which the VM controls */
+unsigned long vm_total_pages;	/* The total number of pages which the VM controls */
 
 static LIST_HEAD(shrinker_list);
 static DECLARE_RWSEM(shrinker_rwsem);