On 01/29/2013 10:31 PM, Michal Hocko wrote: > On Mon 28-01-13 18:54:46, Jeff Liu wrote: >> Export nr_swap_files which would be used for initializing and destorying >> swap cgroup structures in the coming patch. >> >> Signed-off-by: Jie Liu <jeff.liu@xxxxxxxxxx> >> CC: Glauber Costa <glommer@xxxxxxxxxxxxx> >> CC: Michal Hocko <mhocko@xxxxxxx> >> CC: Kamezawa Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> >> CC: Johannes Weiner <hannes@xxxxxxxxxxx> >> CC: Mel Gorman <mgorman@xxxxxxx> >> CC: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> >> CC: Sha Zhengju <handai.szj@xxxxxxxxxx> > > You are missing definition for !CONFIG_SWAP Yep, I missed "#define nr_swapfiles 0U" in this case. Thanks, -Jeff > > After this is fixed you can add my > Acked-by: Michal Hocko <mhocko@xxxxxxx> > >> >> --- >> include/linux/swap.h | 1 + >> mm/swapfile.c | 2 +- >> 2 files changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/include/linux/swap.h b/include/linux/swap.h >> index 68df9c1..6de44c9 100644 >> --- a/include/linux/swap.h >> +++ b/include/linux/swap.h >> @@ -348,6 +348,7 @@ extern struct page *swapin_readahead(swp_entry_t, gfp_t, >> /* linux/mm/swapfile.c */ >> extern long nr_swap_pages; >> extern long total_swap_pages; >> +extern unsigned int nr_swapfiles; >> extern void si_swapinfo(struct sysinfo *); >> extern swp_entry_t get_swap_page(void); >> extern swp_entry_t get_swap_page_of_type(int); >> diff --git a/mm/swapfile.c b/mm/swapfile.c >> index e97a0e5..89cebcf 100644 >> --- a/mm/swapfile.c >> +++ b/mm/swapfile.c >> @@ -46,7 +46,7 @@ static void free_swap_count_continuations(struct swap_info_struct *); >> static sector_t map_swap_entry(swp_entry_t, struct block_device**); >> >> DEFINE_SPINLOCK(swap_lock); >> -static unsigned int nr_swapfiles; >> +unsigned int nr_swapfiles; >> long nr_swap_pages; >> long total_swap_pages; >> static int least_priority; >> -- >> 1.7.9.5 >> >> -- >> To unsubscribe, send a message with 'unsubscribe linux-mm' in >> the body to majordomo@xxxxxxxxx. For more info on Linux MM, >> see: http://www.linux-mm.org/ . >> Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a> > -- To unsubscribe from this list: send the line "unsubscribe cgroups" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
