From f89568d3e6ab6e1158f95f5bc6060e07c4468373 Mon Sep 17 00:00:00 2001 From: Zhang Yanfei Date: Fri, 22 Feb 2013 16:35:48 -0800 Subject: [PATCH] --- yaml --- r: 356615 b: refs/heads/master c: b21e0b90ccb99a377bce0167fed1e881bb5065d7 h: refs/heads/master i: 356613: 984c929a6f26c4f3f9b33389a62acd78c70e30a9 356611: be06736e078c6333b0e1bfbdb677b023bc19913c 356607: 818a787f670f7489ed04e3d69da4403efaee2055 v: v3 --- [refs] | 2 +- trunk/include/linux/swap.h | 2 +- trunk/mm/vmscan.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fe7252d89a23..bfc26d89dc43 100644 --- 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 index 8a15f38ebc5c..2818a123f3ea 100644 --- 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 index 606d0bb46091..88c5fed8b9a4 100644 --- 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);