On Fri, Jul 13, 2018 at 07:36:32AM +0800, Huang, Ying wrote: > @@ -1260,7 +1257,6 @@ static void swapcache_free(swp_entry_t entry) > } > } > > -#ifdef CONFIG_THP_SWAP > static void swapcache_free_cluster(swp_entry_t entry) > { > unsigned long offset = swp_offset(entry); > @@ -1271,6 +1267,9 @@ static void swapcache_free_cluster(swp_entry_t entry) > unsigned int i, free_entries = 0; > unsigned char val; > > + if (!IS_ENABLED(CONFIG_THP_SWAP)) > + return; > + VM_WARN_ON_ONCE(1) here too? The rest of the patch looks good.