From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753211Ab0HQGCl (ORCPT ); Tue, 17 Aug 2010 02:02:41 -0400 Received: from mail-px0-f174.google.com ([209.85.212.174]:38052 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751371Ab0HQGCk (ORCPT ); Tue, 17 Aug 2010 02:02:40 -0400 Subject: [RFC PATCH] of/microblaze: fix includes so that asm/prom.h doesn't need linux/of*.h To: linux-kernel@vger.kernel.org From: Grant Likely Cc: Michal Simek Date: Tue, 17 Aug 2010 00:02:37 -0600 Message-ID: <20100817060051.20467.10072.stgit@angua> User-Agent: StGit/0.15 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org asm/prom.h has some nasty include ordering issues because a number of files assume that linux/of_* is included by prom.h. This patch fixes the Microblaze occurrences. Signed-off-by: Grant Likely --- Hi Michal, And here is my patch that fixes all the include issues so the remaining lines can be removed from prom.h. I'll add this one to my test-devicetree branch along with similar patches to fix powerpc and sparc, and probably merge it in 2.6.37. Cheers, g. arch/microblaze/include/asm/prom.h | 9 --------- arch/microblaze/kernel/prom.c | 3 ++- arch/microblaze/kernel/prom_parse.c | 3 ++- arch/microblaze/kernel/setup.c | 3 ++- arch/microblaze/pci/pci-common.c | 1 + drivers/net/xilinx_emaclite.c | 1 + drivers/serial/of_serial.c | 1 + drivers/serial/uartlite.c | 1 + 8 files changed, 10 insertions(+), 12 deletions(-) diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h index 101fa09..59c7932 100644 --- a/arch/microblaze/include/asm/prom.h +++ b/arch/microblaze/include/asm/prom.h @@ -83,13 +83,4 @@ extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq); #endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */ - -/* These includes are put at the bottom because they may contain things - * that are overridden by this file. Ideally they shouldn't be included - * by this file, but there are a bunch of .c files that currently depend - * on it. Eventually they will be cleaned up. */ -#include -#include -#include - #endif /* _ASM_MICROBLAZE_PROM_H */ diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c index 427b13b..cca32f3 100644 --- a/arch/microblaze/kernel/prom.c +++ b/arch/microblaze/kernel/prom.c @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include #include #include @@ -31,7 +33,6 @@ #include #include -#include #include #include #include diff --git a/arch/microblaze/kernel/prom_parse.c b/arch/microblaze/kernel/prom_parse.c index 99d9b61..004a276 100644 --- a/arch/microblaze/kernel/prom_parse.c +++ b/arch/microblaze/kernel/prom_parse.c @@ -6,8 +6,9 @@ #include #include #include +#include #include -#include +#include #include #ifdef CONFIG_PCI diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index f5f7688..47c8331 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include #include #include @@ -31,7 +33,6 @@ #include #include -#include #include DEFINE_PER_CPU(unsigned int, KSP); /* Saved kernel stack pointer */ diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index 55ef532..2e3c60a 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index ecbbb68..68a4498 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c index 2af8fd1..387858e 100644 --- a/drivers/serial/of_serial.c +++ b/drivers/serial/of_serial.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c index 9b03d7b..95e5c27 100644 --- a/drivers/serial/uartlite.c +++ b/drivers/serial/uartlite.c @@ -23,6 +23,7 @@ #include #include #include +#include #include /* Match table for of_platform binding */