Patchwork powerpc: fix system.h fallout in sysdev/scom.c [chroma_defconfig]

login
register
mail settings
Submitter Paul Gortmaker
Date April 16, 2012, 5:04 a.m.
Message ID <1334552674-24107-1-git-send-email-paul.gortmaker@windriver.com>
Download mbox | patch
Permalink /patch/152756/
State Accepted
Headers show

Comments

Paul Gortmaker - April 16, 2012, 5:04 a.m.
The following shows up in chroma_defconfig:

 CC      arch/powerpc/sysdev/scom.o
arch/powerpc/sysdev/scom.c: In function 'scom_debug_init':
arch/powerpc/sysdev/scom.c:182:36: error: 'powerpc_debugfs_root' undeclared (first use in this function)
arch/powerpc/sysdev/scom.c:182:36: note: each undeclared identifier is reported only once for each function it appears in
make[2]: *** [arch/powerpc/sysdev/scom.o] Error 1
make[1]: *** [arch/powerpc/sysdev/scom.o] Error 2

A bisect leads to commit 9ffc93f203c18a70623f21950f1dd473c9ec48cd

    "Remove all #inclusions of asm/system.h"

Add the debug header which contains powerpc_debugfs_root.

Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

[Ben, let me know if you want to take this or have me keep it.]
David Howells - April 16, 2012, 8:37 a.m.
Paul Gortmaker <paul.gortmaker@windriver.com> wrote:

> The following shows up in chroma_defconfig:
> 
>  CC      arch/powerpc/sysdev/scom.o
> arch/powerpc/sysdev/scom.c: In function 'scom_debug_init':
> arch/powerpc/sysdev/scom.c:182:36: error: 'powerpc_debugfs_root' undeclared (first use in this function)
> arch/powerpc/sysdev/scom.c:182:36: note: each undeclared identifier is reported only once for each function it appears in
> make[2]: *** [arch/powerpc/sysdev/scom.o] Error 1
> make[1]: *** [arch/powerpc/sysdev/scom.o] Error 2
> 
> A bisect leads to commit 9ffc93f203c18a70623f21950f1dd473c9ec48cd
> 
>     "Remove all #inclusions of asm/system.h"
> 
> Add the debug header which contains powerpc_debugfs_root.
> 
> Cc: David Howells <dhowells@redhat.com>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

Acked-by: David Howells <dhowells@redhat.com>

Patch

diff --git a/arch/powerpc/sysdev/scom.c b/arch/powerpc/sysdev/scom.c
index 49a3ece..702256a 100644
--- a/arch/powerpc/sysdev/scom.c
+++ b/arch/powerpc/sysdev/scom.c
@@ -22,6 +22,7 @@ 
 #include <linux/debugfs.h>
 #include <linux/slab.h>
 #include <linux/export.h>
+#include <asm/debug.h>
 #include <asm/prom.h>
 #include <asm/scom.h>