Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934868Ab3DHIyv (ORCPT ); Mon, 8 Apr 2013 04:54:51 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:21453 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934458Ab3DHIyu (ORCPT ); Mon, 8 Apr 2013 04:54:50 -0400 From: Yijing Wang To: Andrew Morton CC: , , Hanjun Guo , , Yijing Wang , Minchan Kim , Mel Gorman , Bartlomiej Zolnierkiewicz , Rik van Riel , Hugh Dickins , Bill Pemberton , Greg Kroah-Hartman Subject: [Resend with Ack][PATCH] mm: remove CONFIG_HOTPLUG ifdefs Date: Mon, 8 Apr 2013 16:53:22 +0800 Message-ID: <1365411202-8612-1-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.11.msysgit.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.135.76.69] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1746 Lines: 65 CONFIG_HOTPLUG is going away as an option, cleanup CONFIG_HOTPLUG ifdefs in mm files. Signed-off-by: Yijing Wang Acked-by: Greg Kroah-Hartman Cc: Minchan Kim Cc: Mel Gorman Cc: Bartlomiej Zolnierkiewicz Cc: Rik van Riel Cc: Hugh Dickins Cc: Bill Pemberton Cc: Greg Kroah-Hartman --- include/linux/vmstat.h | 7 +------ mm/vmstat.c | 2 -- 2 files changed, 1 insertions(+), 8 deletions(-) diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index 5fd71a7..c586679 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -48,13 +48,8 @@ static inline void count_vm_events(enum vm_event_item item, long delta) } extern void all_vm_events(unsigned long *); -#ifdef CONFIG_HOTPLUG + extern void vm_events_fold_cpu(int cpu); -#else -static inline void vm_events_fold_cpu(int cpu) -{ -} -#endif #else diff --git a/mm/vmstat.c b/mm/vmstat.c index e1d8ed1..c823776 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -52,7 +52,6 @@ void all_vm_events(unsigned long *ret) } EXPORT_SYMBOL_GPL(all_vm_events); -#ifdef CONFIG_HOTPLUG /* * Fold the foreign cpu events into our own. * @@ -69,7 +68,6 @@ void vm_events_fold_cpu(int cpu) fold_state->event[i] = 0; } } -#endif /* CONFIG_HOTPLUG */ #endif /* CONFIG_VM_EVENT_COUNTERS */ -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/