From patchwork Wed May 11 14:54:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102357 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp268538qge; Wed, 11 May 2016 07:55:49 -0700 (PDT) X-Received: by 10.66.152.237 with SMTP id vb13mr5535117pab.3.1462978549693; Wed, 11 May 2016 07:55:49 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 64si10144580pfz.17.2016.05.11.07.55.49; Wed, 11 May 2016 07:55:49 -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 S932210AbcEKOzr (ORCPT + 29 others); Wed, 11 May 2016 10:55:47 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:63485 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751400AbcEKOzp (ORCPT ); Wed, 11 May 2016 10:55:45 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0Lzadu-1bdflm3ZlS-014mmd; Wed, 11 May 2016 16:55:25 +0200 From: Arnd Bergmann To: Andrew Morton , Hugh Dickins Cc: Arnd Bergmann , Vlastimil Babka , Michal Hocko , Christoph Lameter , Mel Gorman , Joonsoo Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm: unhide vmstat_text definition for CONFIG_SMP Date: Wed, 11 May 2016 16:54:55 +0200 Message-Id: <1462978517-2972312-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:9vi+zowZ5qOe4VVjBqVF4L2q+MfXqY8Nce4IWWXdG5OdEPch1d/ YUSvQgE2xtTYDRVkYVfj05bkuUqae7DKONL8emtDDvV6sI8esDFEidVXG1PQLcmQdFcZEtQ 23yFI1ipHTxXkDmL+2nMHyTT45AvdH84466nRC7oUOm8WN40cM6sMuSqcEUu82zJgDRUZf3 W61YLgHFOaa0huZRvfVfA== X-UI-Out-Filterresults: notjunk:1; V01:K0:tDctfR1Qb/4=:UpuomeRTuf3YlhyrGMP3YC 6dYInyTUUA0I8DbUZbwawCwCyD1L4o0nTYhF6DOgzQoDvJJd4eDxnIKh0CECuQPxDbIa+GsSz IUsgHpST27rXh3+4Jscx1Wu1y+7AgJ+c9gSGZRRKlfx1JmdOwWoGTfB7W/jZ12ZrQ0+h6iLWQ M99BhQzDJlICg+Z+BwWwgU3gtp9iW7hf2YH34KBdSWVs3GF6K+NS5p/qthMlQank6u3ZdDK22 MdRm6ePGjKSYHprvRSNggsGES0TlIlIplLFh44eZTlVB3Jy2i6BW62PqPgX5b5wxSM1F141do lbACoKiEA9IAlbuIMnuFKUDDIBqGmOgT4L69HFfOeLFdaE6tq4zwRPodOsqJM3+pWu5LMqe29 oCa/XYmat8mKmaZUQ8yhNLcegKlnks0hmJzS6gjK9dQd5Pq5YzLZJ+MBkPLhncNGi2G+Ux6nJ Pib1yAySka9+2z/VsnsiZbBzM/SCCKFi6U+6/u2CTNQ86r2P6WdgvCMmdiud1iR9lIMw3L/sA aaBL+Iv3UUlmas/Kz0vly7XdeJr5h2oRu7XYuhceVyyqCmWrcXqR8sdh4IUv4NLpcSmClihFO v9Hb2QBHiY7a3OX9FLqkQ7mQ9uxYbg8PnZwZDHuQHjHrx9+IQ3vbtMTd4vvrdCqGSZVCMDHm0 tFJUc/AvnfCn7B3N9uGdf3V5RFTMFUCxUN8Zz3jSNy+peGVrDGHC2TePAvR0RAUQFQ2M= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In randconfig builds with sysfs, procfs and numa all disabled, but SMP enabled, we now get a link error in the newly introduced vmstat_refresh function: mm/built-in.o: In function `vmstat_refresh': :(.text+0x15c78): undefined reference to `vmstat_text' This modifes the already elaborate #ifdef to also cover that configuration. Signed-off-by: Arnd Bergmann Fixes: mmotm ("mm: /proc/sys/vm/stat_refresh to force vmstat update") --- mm/vmstat.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.7.0 diff --git a/mm/vmstat.c b/mm/vmstat.c index 57a24e919907..5367eb9b858b 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -678,7 +678,8 @@ int fragmentation_index(struct zone *zone, unsigned int order) } #endif -#if defined(CONFIG_PROC_FS) || defined(CONFIG_SYSFS) || defined(CONFIG_NUMA) +#if defined(CONFIG_PROC_FS) || defined(CONFIG_SYSFS) || \ + defined(CONFIG_NUMA) || defined(CONFIG_SMP) #ifdef CONFIG_ZONE_DMA #define TEXT_FOR_DMA(xx) xx "_dma", #else @@ -857,7 +858,7 @@ const char * const vmstat_text[] = { #endif #endif /* CONFIG_VM_EVENTS_COUNTERS */ }; -#endif /* CONFIG_PROC_FS || CONFIG_SYSFS || CONFIG_NUMA */ +#endif /* CONFIG_PROC_FS || CONFIG_SYSFS || CONFIG_NUMA || CONFIG_SMP */ #if (defined(CONFIG_DEBUG_FS) && defined(CONFIG_COMPACTION)) || \