From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.3 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F06BC352BE for ; Fri, 17 Apr 2020 16:22:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 44C9F2072D for ; Fri, 17 Apr 2020 16:22:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="uik9Q8Uz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 44C9F2072D Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D1DA88E0033; Fri, 17 Apr 2020 12:22:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CCE758E0023; Fri, 17 Apr 2020 12:22:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BBEA38E0033; Fri, 17 Apr 2020 12:22:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0247.hostedemail.com [216.40.44.247]) by kanga.kvack.org (Postfix) with ESMTP id A089D8E0023 for ; Fri, 17 Apr 2020 12:22:13 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 61470824556B for ; Fri, 17 Apr 2020 16:22:13 +0000 (UTC) X-FDA: 76717864146.18.hill82_4d8ae93d5ed33 X-HE-Tag: hill82_4d8ae93d5ed33 X-Filterd-Recvd-Size: 17323 Received: from mail-lj1-f196.google.com (mail-lj1-f196.google.com [209.85.208.196]) by imf15.hostedemail.com (Postfix) with ESMTP for ; Fri, 17 Apr 2020 16:22:12 +0000 (UTC) Received: by mail-lj1-f196.google.com with SMTP id z26so2607722ljz.11 for ; Fri, 17 Apr 2020 09:22:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=VTOsrAGmYE6zBJk+aAJC/tucrQoHiEhGt4Yri3ta34w=; b=uik9Q8UzCXCG80KKd7gRslEnCmX8YdY2c5VMEGwZhql6xmJDf/V1fo6W6DGn9gXYYa kkaG3LtISY9VCD/Cfjlvio3B/c4H0xlvcFrKc195DG6wv9YygW8E8V6eX8uUFjVVjxaG lAduhkSigbOvwzLtzGpjFy/n2ar1FcDH1Hp9fzkZBISWJgj5kOgv7zN+oq9h3b5v3zkf WUHBWm03E6QQ9usHRYVOyU358Ln97s+56pcqBTugBGZhboghlUUQ/XwOom2jYsITAL4c cfN5A6/PcgJRcgTXqfr41XxxlpKqn6AAu7jjleEdLAE6AXp5T7ooomohU2s9+mbNkNae 5sQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=VTOsrAGmYE6zBJk+aAJC/tucrQoHiEhGt4Yri3ta34w=; b=WreOpeGLRdYgrBtZ8New2xJFknQ++mfoMKZjeMjasyOeS7d4PGpzR0yZ9XoMGOUuzI B/xTn3hY0DwNQ459BCgctEVseTlnx/fLlqyivfDlsvUldfVS7vOi4BgmvA+VakvXNTkx KmlQMW2/UVVoFudCjso1FjA8nEi1vWMLpvXlnv6zUEP04yIkzddANIFdDwMZuBmsyE2r cBYd6lCk/vYSWG2iYEwkOb8JNuhF9qbk5awsChb9K4u6igRJhE9nGH5j2Ij8rpOcdxwT FLe7d33/RWF2fyAgOezVt8x6VHbOcjCwOX+PoX9inbacQL8uwFalaXBHW+77ATgq9OOT OALw== X-Gm-Message-State: AGi0PuYKhbZqtbQKZ/vGzHPxS1E/zYjyvR9hs6fU2vib84S3mCm1zwTR fVSbkAEl6po5yX9cZRoU0WoE6Nac3pATlHjwC0aJtA4iiDk= X-Google-Smtp-Source: APiQypKirUYMSBlWd4gvcD/H4a+sNjHRCz1NXnYgUWkEMOxybktjiCbbBiKzHWGOdQAkEx/1jC92CeIjxKljXMkAAx8= X-Received: by 2002:a2e:9a4a:: with SMTP id k10mr2663493ljj.115.1587140531138; Fri, 17 Apr 2020 09:22:11 -0700 (PDT) MIME-Version: 1.0 References: <1587134624-184860-1-git-send-email-alex.shi@linux.alibaba.com> In-Reply-To: <1587134624-184860-1-git-send-email-alex.shi@linux.alibaba.com> From: Shakeel Butt Date: Fri, 17 Apr 2020 09:22:00 -0700 Message-ID: Subject: Re: [PATCH 1/2] memcg: folding CONFIG_MEMCG_SWAP as default To: Alex Shi Cc: Andrew Morton , Johannes Weiner , Linux MM , Cgroups Content-Type: text/plain; charset="UTF-8" X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, Apr 17, 2020 at 7:44 AM Alex Shi wrote: > > This patch fold MEMCG_SWAP feature into kernel as default function. That > required a short size memcg id for each of page. As Johannes mentioned > > "the overhead of tracking is tiny - 512k per G of swap (0.04%).' > > So all swapout page could be tracked for its memcg id. > > Signed-off-by: Alex Shi > Cc: Andrew Morton > Cc: Johannes Weiner > Cc: linux-mm@kvack.org > Cc: cgroups@vger.kernel.org > --- > arch/arm/configs/omap2plus_defconfig | 1 - > arch/arm64/configs/defconfig | 1 - > arch/mips/configs/db1xxx_defconfig | 1 - > arch/mips/configs/generic_defconfig | 1 - > arch/mips/configs/loongson3_defconfig | 1 - > arch/parisc/configs/generic-64bit_defconfig | 1 - > arch/powerpc/configs/powernv_defconfig | 1 - > arch/powerpc/configs/pseries_defconfig | 1 - > arch/s390/configs/debug_defconfig | 1 - > arch/s390/configs/defconfig | 1 - > arch/sh/configs/sdk7786_defconfig | 1 - > arch/sh/configs/urquell_defconfig | 1 - > include/linux/memcontrol.h | 2 -- > include/linux/swap.h | 27 -------------------------- > include/linux/swap_cgroup.h | 30 ----------------------------- > init/Kconfig | 20 ------------------- > mm/Makefile | 4 ++-- > mm/memcontrol.c | 18 ----------------- > 18 files changed, 2 insertions(+), 111 deletions(-) > > diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig > index 3cc3ca5fa027..929cfc4c062a 100644 > --- a/arch/arm/configs/omap2plus_defconfig > +++ b/arch/arm/configs/omap2plus_defconfig > @@ -10,7 +10,6 @@ CONFIG_IKCONFIG_PROC=y > CONFIG_LOG_BUF_SHIFT=16 > CONFIG_CGROUPS=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CGROUP_SCHED=y > CONFIG_CFS_BANDWIDTH=y > diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig > index 24e534d85045..3854c6140a04 100644 > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@ -13,7 +13,6 @@ CONFIG_IKCONFIG=y > CONFIG_IKCONFIG_PROC=y > CONFIG_NUMA_BALANCING=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CGROUP_PIDS=y > CONFIG_CGROUP_HUGETLB=y > diff --git a/arch/mips/configs/db1xxx_defconfig b/arch/mips/configs/db1xxx_defconfig > index e6f3e8e3da39..4604e826d03f 100644 > --- a/arch/mips/configs/db1xxx_defconfig > +++ b/arch/mips/configs/db1xxx_defconfig > @@ -9,7 +9,6 @@ CONFIG_HIGH_RES_TIMERS=y > CONFIG_LOG_BUF_SHIFT=16 > CONFIG_CGROUPS=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CGROUP_SCHED=y > CONFIG_CFS_BANDWIDTH=y > diff --git a/arch/mips/configs/generic_defconfig b/arch/mips/configs/generic_defconfig > index 714169e411cf..48e4e251779b 100644 > --- a/arch/mips/configs/generic_defconfig > +++ b/arch/mips/configs/generic_defconfig > @@ -3,7 +3,6 @@ CONFIG_NO_HZ_IDLE=y > CONFIG_IKCONFIG=y > CONFIG_IKCONFIG_PROC=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CFS_BANDWIDTH=y > CONFIG_RT_GROUP_SCHED=y > diff --git a/arch/mips/configs/loongson3_defconfig b/arch/mips/configs/loongson3_defconfig > index 51675f5000d6..f91f49595100 100644 > --- a/arch/mips/configs/loongson3_defconfig > +++ b/arch/mips/configs/loongson3_defconfig > @@ -13,7 +13,6 @@ CONFIG_TASK_DELAY_ACCT=y > CONFIG_TASK_XACCT=y > CONFIG_TASK_IO_ACCOUNTING=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CPUSETS=y > CONFIG_SCHED_AUTOGROUP=y > diff --git a/arch/parisc/configs/generic-64bit_defconfig b/arch/parisc/configs/generic-64bit_defconfig > index 59561e04e659..fab4401dd9f6 100644 > --- a/arch/parisc/configs/generic-64bit_defconfig > +++ b/arch/parisc/configs/generic-64bit_defconfig > @@ -10,7 +10,6 @@ CONFIG_TASK_XACCT=y > CONFIG_TASK_IO_ACCOUNTING=y > CONFIG_CGROUPS=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_CGROUP_PIDS=y > CONFIG_CPUSETS=y > CONFIG_RELAY=y > diff --git a/arch/powerpc/configs/powernv_defconfig b/arch/powerpc/configs/powernv_defconfig > index df8bdbaa5d8f..c60c3a4125f7 100644 > --- a/arch/powerpc/configs/powernv_defconfig > +++ b/arch/powerpc/configs/powernv_defconfig > @@ -17,7 +17,6 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=13 > CONFIG_NUMA_BALANCING=y > CONFIG_CGROUPS=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_CGROUP_SCHED=y > CONFIG_CGROUP_FREEZER=y > CONFIG_CPUSETS=y > diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig > index 0bea4d3ffb85..426244f491ec 100644 > --- a/arch/powerpc/configs/pseries_defconfig > +++ b/arch/powerpc/configs/pseries_defconfig > @@ -16,7 +16,6 @@ CONFIG_LOG_CPU_MAX_BUF_SHIFT=13 > CONFIG_NUMA_BALANCING=y > CONFIG_CGROUPS=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_CGROUP_SCHED=y > CONFIG_CGROUP_FREEZER=y > CONFIG_CPUSETS=y > diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_defconfig > index 46038bc58c9e..864b32403673 100644 > --- a/arch/s390/configs/debug_defconfig > +++ b/arch/s390/configs/debug_defconfig > @@ -14,7 +14,6 @@ CONFIG_IKCONFIG=y > CONFIG_IKCONFIG_PROC=y > CONFIG_NUMA_BALANCING=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CFS_BANDWIDTH=y > CONFIG_RT_GROUP_SCHED=y > diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig > index 7cd0648c1f4e..991e60d7c307 100644 > --- a/arch/s390/configs/defconfig > +++ b/arch/s390/configs/defconfig > @@ -13,7 +13,6 @@ CONFIG_IKCONFIG=y > CONFIG_IKCONFIG_PROC=y > CONFIG_NUMA_BALANCING=y > CONFIG_MEMCG=y > -CONFIG_MEMCG_SWAP=y > CONFIG_BLK_CGROUP=y > CONFIG_CFS_BANDWIDTH=y > CONFIG_RT_GROUP_SCHED=y > diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig > index 7fa116b436c3..4a1d19068a8d 100644 > --- a/arch/sh/configs/sdk7786_defconfig > +++ b/arch/sh/configs/sdk7786_defconfig > @@ -17,7 +17,6 @@ CONFIG_CPUSETS=y > # CONFIG_PROC_PID_CPUSET is not set > CONFIG_CGROUP_CPUACCT=y > CONFIG_CGROUP_MEMCG=y > -CONFIG_CGROUP_MEMCG_SWAP=y > CONFIG_CGROUP_SCHED=y > CONFIG_RT_GROUP_SCHED=y > CONFIG_BLK_CGROUP=y > diff --git a/arch/sh/configs/urquell_defconfig b/arch/sh/configs/urquell_defconfig > index cb2f56468fe0..be478f3148f2 100644 > --- a/arch/sh/configs/urquell_defconfig > +++ b/arch/sh/configs/urquell_defconfig > @@ -14,7 +14,6 @@ CONFIG_CPUSETS=y > # CONFIG_PROC_PID_CPUSET is not set > CONFIG_CGROUP_CPUACCT=y > CONFIG_CGROUP_MEMCG=y > -CONFIG_CGROUP_MEMCG_SWAP=y > CONFIG_CGROUP_SCHED=y > CONFIG_RT_GROUP_SCHED=y > CONFIG_BLK_DEV_INITRD=y > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index 1b4150ff64be..45842ed8ba53 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -569,9 +569,7 @@ struct mem_cgroup *mem_cgroup_get_oom_group(struct task_struct *victim, > struct mem_cgroup *oom_domain); > void mem_cgroup_print_oom_group(struct mem_cgroup *memcg); > > -#ifdef CONFIG_MEMCG_SWAP > extern int do_swap_account; This can be removed too. > -#endif > > struct mem_cgroup *lock_page_memcg(struct page *page); > void __unlock_page_memcg(struct mem_cgroup *memcg); > diff --git a/include/linux/swap.h b/include/linux/swap.h > index b835d8dbea0e..7e44e1e6ef27 100644 > --- a/include/linux/swap.h > +++ b/include/linux/swap.h > @@ -654,38 +654,11 @@ static inline void mem_cgroup_throttle_swaprate(struct mem_cgroup *memcg, > } > #endif > > -#ifdef CONFIG_MEMCG_SWAP > extern void mem_cgroup_swapout(struct page *page, swp_entry_t entry); > extern int mem_cgroup_try_charge_swap(struct page *page, swp_entry_t entry); > extern void mem_cgroup_uncharge_swap(swp_entry_t entry, unsigned int nr_pages); > extern long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg); > extern bool mem_cgroup_swap_full(struct page *page); > -#else > -static inline void mem_cgroup_swapout(struct page *page, swp_entry_t entry) > -{ > -} > - > -static inline int mem_cgroup_try_charge_swap(struct page *page, > - swp_entry_t entry) > -{ > - return 0; > -} > - > -static inline void mem_cgroup_uncharge_swap(swp_entry_t entry, > - unsigned int nr_pages) > -{ > -} > - > -static inline long mem_cgroup_get_nr_swap_pages(struct mem_cgroup *memcg) > -{ > - return get_nr_swap_pages(); > -} > - > -static inline bool mem_cgroup_swap_full(struct page *page) > -{ > - return vm_swap_full(); > -} > -#endif > > #endif /* __KERNEL__*/ > #endif /* _LINUX_SWAP_H */ > diff --git a/include/linux/swap_cgroup.h b/include/linux/swap_cgroup.h > index a12dd1c3966c..5ac87b3b0e08 100644 > --- a/include/linux/swap_cgroup.h > +++ b/include/linux/swap_cgroup.h > @@ -4,8 +4,6 @@ > > #include > > -#ifdef CONFIG_MEMCG_SWAP > - > extern unsigned short swap_cgroup_cmpxchg(swp_entry_t ent, > unsigned short old, unsigned short new); > extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id, > @@ -14,32 +12,4 @@ extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id, > extern int swap_cgroup_swapon(int type, unsigned long max_pages); > extern void swap_cgroup_swapoff(int type); > > -#else > - > -static inline > -unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id, > - unsigned int nr_ents) > -{ > - return 0; > -} > - > -static inline > -unsigned short lookup_swap_cgroup_id(swp_entry_t ent) > -{ > - return 0; > -} > - > -static inline int > -swap_cgroup_swapon(int type, unsigned long max_pages) > -{ > - return 0; > -} > - > -static inline void swap_cgroup_swapoff(int type) > -{ > - return; > -} > - > -#endif /* CONFIG_MEMCG_SWAP */ > - > #endif /* __LINUX_SWAP_CGROUP_H */ > diff --git a/init/Kconfig b/init/Kconfig > index 9e22ee8fbd75..3b09c71e9b57 100644 > --- a/init/Kconfig > +++ b/init/Kconfig > @@ -834,26 +834,6 @@ config MEMCG > help > Provides control over the memory footprint of tasks in a cgroup. > > -config MEMCG_SWAP > - bool "Swap controller" > - depends on MEMCG && SWAP > - help > - Provides control over the swap space consumed by tasks in a cgroup. > - > -config MEMCG_SWAP_ENABLED > - bool "Swap controller enabled by default" > - depends on MEMCG_SWAP > - default y > - help > - Memory Resource Controller Swap Extension comes with its price in > - a bigger memory consumption. General purpose distribution kernels > - which want to enable the feature but keep it disabled by default > - and let the user enable it by swapaccount=1 boot command line > - parameter should have this option unselected. > - For those who want to have the feature enabled by default should > - select this option (if, for some reason, they need to disable it > - then swapaccount=0 does the trick). > - > config MEMCG_KMEM > bool > depends on MEMCG && !SLOB > diff --git a/mm/Makefile b/mm/Makefile > index fccd3756b25f..812c08323355 100644 > --- a/mm/Makefile > +++ b/mm/Makefile > @@ -58,7 +58,8 @@ ifdef CONFIG_MMU > obj-$(CONFIG_ADVISE_SYSCALLS) += madvise.o > endif > > -obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o swap_slots.o > +obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o swap_slots.o \ > + swap_cgroup.o > obj-$(CONFIG_FRONTSWAP) += frontswap.o > obj-$(CONFIG_ZSWAP) += zswap.o > obj-$(CONFIG_HAS_DMA) += dmapool.o > @@ -80,7 +81,6 @@ obj-$(CONFIG_MIGRATION) += migrate.o > obj-$(CONFIG_TRANSPARENT_HUGEPAGE) += huge_memory.o khugepaged.o > obj-$(CONFIG_PAGE_COUNTER) += page_counter.o > obj-$(CONFIG_MEMCG) += memcontrol.o vmpressure.o > -obj-$(CONFIG_MEMCG_SWAP) += swap_cgroup.o > obj-$(CONFIG_CGROUP_HUGETLB) += hugetlb_cgroup.o > obj-$(CONFIG_GUP_BENCHMARK) += gup_benchmark.o > obj-$(CONFIG_MEMORY_FAILURE) += memory-failure.o > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 5beea03dd58a..446141b6597a 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -82,11 +82,7 @@ > static bool cgroup_memory_nokmem; > > /* Whether the swap controller is active */ > -#ifdef CONFIG_MEMCG_SWAP > int do_swap_account __read_mostly; > -#else > -#define do_swap_account 0 > -#endif > > #ifdef CONFIG_CGROUP_WRITEBACK > static DECLARE_WAIT_QUEUE_HEAD(memcg_cgwb_frn_waitq); > @@ -3020,7 +3016,6 @@ void mem_cgroup_split_huge_fixup(struct page *head) > } > #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ > > -#ifdef CONFIG_MEMCG_SWAP > /** > * mem_cgroup_move_swap_account - move swap charge and swap_cgroup's record. > * @entry: swap entry to be moved > @@ -3050,13 +3045,6 @@ static int mem_cgroup_move_swap_account(swp_entry_t entry, > } > return -EINVAL; > } > -#else > -static inline int mem_cgroup_move_swap_account(swp_entry_t entry, > - struct mem_cgroup *from, struct mem_cgroup *to) > -{ > - return -EINVAL; > -} > -#endif > > static DEFINE_MUTEX(memcg_max_mutex); > > @@ -6936,7 +6924,6 @@ static int __init mem_cgroup_init(void) > } > subsys_initcall(mem_cgroup_init); > > -#ifdef CONFIG_MEMCG_SWAP > static struct mem_cgroup *mem_cgroup_id_get_online(struct mem_cgroup *memcg) > { > while (!refcount_inc_not_zero(&memcg->id.ref)) { > @@ -7137,11 +7124,7 @@ bool mem_cgroup_swap_full(struct page *page) > } > > /* for remember boot option*/ > -#ifdef CONFIG_MEMCG_SWAP_ENABLED > static int really_do_swap_account __initdata = 1; > -#else > -static int really_do_swap_account __initdata; > -#endif > > static int __init enable_swap_account(char *s) > { > @@ -7257,4 +7240,3 @@ static int __init mem_cgroup_swap_init(void) > } > subsys_initcall(mem_cgroup_swap_init); > > -#endif /* CONFIG_MEMCG_SWAP */ > -- > 1.8.3.1 >