From patchwork Tue Aug 9 12:36:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101968 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp463542qga; Tue, 9 Aug 2016 05:37:12 -0700 (PDT) X-Received: by 10.66.100.162 with SMTP id ez2mr146284944pab.123.1470746232363; Tue, 09 Aug 2016 05:37:12 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fm1si27641742pad.221.2016.08.09.05.37.10; Tue, 09 Aug 2016 05:37:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932360AbcHIMg7 (ORCPT + 27 others); Tue, 9 Aug 2016 08:36:59 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:63803 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932284AbcHIMg5 (ORCPT ); Tue, 9 Aug 2016 08:36:57 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0McFi3-1bq02G42gp-00JYt6; Tue, 09 Aug 2016 14:36:44 +0200 From: Arnd Bergmann To: Andrew Morton Cc: Arnd Bergmann , Hugh Dickins , Al Viro , "Kirill A. Shutemov" , Vlastimil Babka , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] thp: move shmem_huge_enabled() outside of SYSFS ifdef Date: Tue, 9 Aug 2016 14:36:02 +0200 Message-Id: <20160809123638.1357593-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:MabmtWj+kr9RyNOVA838C9zty3lfzPmK7Sff/oNxOe6n8G/ahxT /LFCnhUUv1gzOjro2tVODFb7f/TZedM/f+kizMxUgEwzbCIieIPSOmtBdj311P29n7gllkA jYjn+IiCUWmUztdER7umpBESAyruUSUf8WhRs7WpdutAO7OxGc8+d3DuvDbPpancb3Q+Zvu PgoVm5Bu/LTueef5QRKfw== X-UI-Out-Filterresults: notjunk:1; V01:K0:VDBoXvLDoE8=:YhQSG8Z+Tv5zHvA7vkBiV7 007mybuxjlXwx8+KNaA7+bj9OWqw/zgkmityJwESmy0FjqQHhTUerxVB2itUcWtfQLem8s1Yc VqN/WelhYShMwRqflXTfcqBEkaCKXi6kOhvLybpEOCh4gxeSTi1nCuExHTh334siKdwWfiXvM Pq+Ks2la4OWjtDy3P24JJFOMglXw0FHy2RzwGrqLWFNSX6raBAwmBkJiuWQl6ywNMjtufbOy7 lCspOG4W30bN0RnUZ+/v1TVyKZtfiNkiP7YBEXdH7t4wLBCkcHCt5RMhkiaLDpLzaiKyqefYC QPnzMRuIy2AjTBrsBVsQcH4JsSq63KeD9ZBP3oFBpxkMDXosHytsfK0Afi3OB5ODyJsEaKWn2 U1yGmQR3z7bSbJ3RGiLptV5SeUH26f+46Pnwa4aLIFFrwOR+eyWGN/omynUJzKDSPtriLX3le TJLDcpqfRQNRqK8tfkJtRieIFRwRRKYgiF5I38rEdvJz9JJSVxIMbMXzImTHAAMbQ41ZsAqAO 7/8psE3aAc2TtGSvA4Kpe6EYOw2b1Ru8bQEGFMS9eLrrNpuolvEl6pCYVFsErL3sicfbDrTVz 5gUfCghAnBFDyZu1xqmYhRIFEEnzbgvkiZgOCPyuh5IU19b26k4JwRMGQLK5SObcGRoQLVbk1 gbHN1HGE0ZZtVjHsmnzgmnVc60uLc9AnIATGiwuzrGfEEv3eNwGMXBTfIKsfQsencTnw= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The newly introduced shmem_huge_enabled() function has two definitions, but neither of them is visible if CONFIG_SYSFS is disabled, leading to a build error: mm/khugepaged.o: In function `khugepaged': khugepaged.c:(.text.khugepaged+0x3ca): undefined reference to `shmem_huge_enabled' This changes the #ifdef guards around the definition to match those that are used in the header file. Signed-off-by: Arnd Bergmann Fixes: e496cf3d7821 ("thp: introduce CONFIG_TRANSPARENT_HUGE_PAGECACHE") --- mm/shmem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.9.0 diff --git a/mm/shmem.c b/mm/shmem.c index 7f7748a0f9e1..fd8b2b5741b1 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3975,7 +3975,9 @@ static ssize_t shmem_enabled_store(struct kobject *kobj, struct kobj_attribute shmem_enabled_attr = __ATTR(shmem_enabled, 0644, shmem_enabled_show, shmem_enabled_store); +#endif /* CONFIG_TRANSPARENT_HUGE_PAGECACHE && CONFIG_SYSFS */ +#ifdef CONFIG_TRANSPARENT_HUGE_PAGECACHE bool shmem_huge_enabled(struct vm_area_struct *vma) { struct inode *inode = file_inode(vma->vm_file); @@ -4006,7 +4008,7 @@ bool shmem_huge_enabled(struct vm_area_struct *vma) return false; } } -#endif /* CONFIG_TRANSPARENT_HUGE_PAGECACHE && CONFIG_SYSFS */ +#endif /* CONFIG_TRANSPARENT_HUGE_PAGECACHE */ #else /* !CONFIG_SHMEM */