From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756382Ab3BEEP1 (ORCPT ); Mon, 4 Feb 2013 23:15:27 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:40563 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753323Ab3BEEP0 (ORCPT ); Mon, 4 Feb 2013 23:15:26 -0500 X-IronPort-AV: E=Sophos;i="4.84,603,1355068800"; d="scan'208";a="6689665" From: liguang To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org Cc: liguang Subject: [PATCH] mm: break circular include from linux/mmzone.h Date: Tue, 5 Feb 2013 12:15:07 +0800 Message-Id: <1360037707-13935-1-git-send-email-lig.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.2.5 X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/05 12:14:06, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/05 12:14:07, Serialize complete at 2013/02/05 12:14:07 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org linux/mmzone.h included linux/memory_hotplug.h, and linux/memory_hotplug.h also included linux/mmzone.h, so there's a bad cirlular. Signed-off-by: liguang --- drivers/hwmon/coretemp.c | 2 ++ drivers/hwmon/via-cputemp.c | 2 ++ include/linux/mmzone.h | 1 - kernel/cpu.c | 1 + kernel/smp.c | 1 + lib/show_mem.c | 1 + mm/memory_hotplug.c | 1 + mm/nobootmem.c | 1 + mm/sparse.c | 1 + 9 files changed, 10 insertions(+), 1 deletions(-) diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index d64923d..9a90a3b 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -36,6 +36,8 @@ #include #include #include +#include + #include #include #include diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c index 76f157b..2aab52f 100644 --- a/drivers/hwmon/via-cputemp.c +++ b/drivers/hwmon/via-cputemp.c @@ -35,6 +35,8 @@ #include #include #include +#include + #include #include #include diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 73b64a3..9ca72f4 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -758,7 +758,6 @@ typedef struct pglist_data { __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\ }) -#include extern struct mutex zonelists_mutex; void build_all_zonelists(pg_data_t *pgdat, struct zone *zone); diff --git a/kernel/cpu.c b/kernel/cpu.c index 3046a50..e6e53e6 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "smpboot.h" diff --git a/kernel/smp.c b/kernel/smp.c index 29dd40a..6f4d485 100644 --- a/kernel/smp.c +++ b/kernel/smp.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "smpboot.h" diff --git a/lib/show_mem.c b/lib/show_mem.c index 4407f8c..7c90021 100644 --- a/lib/show_mem.c +++ b/lib/show_mem.c @@ -6,6 +6,7 @@ */ #include +#include #include #include diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index d04ed87..5a73123 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -29,6 +29,7 @@ #include #include #include +#include #include diff --git a/mm/nobootmem.c b/mm/nobootmem.c index b8294fc..36c1547 100644 --- a/mm/nobootmem.c +++ b/mm/nobootmem.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include diff --git a/mm/sparse.c b/mm/sparse.c index 6b5fb76..1b407d5 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -13,6 +13,7 @@ #include #include #include +#include /* * Permanent SPARSEMEM data: -- 1.7.2.5