From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751657AbdFHJYO (ORCPT ); Thu, 8 Jun 2017 05:24:14 -0400 Received: from terminus.zytor.com ([65.50.211.136]:59263 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751583AbdFHJYM (ORCPT ); Thu, 8 Jun 2017 05:24:12 -0400 Date: Thu, 8 Jun 2017 02:19:24 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: mingo@kernel.org, peterz@infradead.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, luto@kernel.org, torvalds@linux-foundation.org, bp@alien8.de, hpa@zytor.com Reply-To: hpa@zytor.com, bp@alien8.de, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, luto@kernel.org, tglx@linutronix.de, mingo@kernel.org, peterz@infradead.org In-Reply-To: <76da9a3cc4415996f2ad2c905b93414add322021.1496673616.git.luto@kernel.org> References: <76da9a3cc4415996f2ad2c905b93414add322021.1496673616.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] mm/vmstat: Make NR_TLB_REMOTE_FLUSH_RECEIVED available even on UP Git-Commit-ID: 5dd0b16cdaff9b94da06074d5888b03235c0bf17 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5dd0b16cdaff9b94da06074d5888b03235c0bf17 Gitweb: http://git.kernel.org/tip/5dd0b16cdaff9b94da06074d5888b03235c0bf17 Author: Andy Lutomirski AuthorDate: Mon, 5 Jun 2017 07:40:25 -0700 Committer: Ingo Molnar CommitDate: Thu, 8 Jun 2017 09:23:09 +0200 mm/vmstat: Make NR_TLB_REMOTE_FLUSH_RECEIVED available even on UP This fixes CONFIG_SMP=n, CONFIG_DEBUG_TLBFLUSH=y without introducing further #ifdef soup. Caught by a Kbuild bot randconfig build. Signed-off-by: Andy Lutomirski Cc: Borislav Petkov Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Fixes: ce4a4e565f52 ("x86/mm: Remove the UP asm/tlbflush.h code, always use the (formerly) SMP code") Link: http://lkml.kernel.org/r/76da9a3cc4415996f2ad2c905b93414add322021.1496673616.git.luto@kernel.org Signed-off-by: Ingo Molnar --- include/linux/vm_event_item.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h index d84ae90..be3ab2d 100644 --- a/include/linux/vm_event_item.h +++ b/include/linux/vm_event_item.h @@ -93,10 +93,8 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, #endif #endif #ifdef CONFIG_DEBUG_TLBFLUSH -#ifdef CONFIG_SMP NR_TLB_REMOTE_FLUSH, /* cpu tried to flush others' tlbs */ NR_TLB_REMOTE_FLUSH_RECEIVED,/* cpu received ipi for flush */ -#endif /* CONFIG_SMP */ NR_TLB_LOCAL_FLUSH_ALL, NR_TLB_LOCAL_FLUSH_ONE, #endif /* CONFIG_DEBUG_TLBFLUSH */