Hi Grant, On Thu, 29 Mar 2012 15:01:17 -0600 Grant Likely <grant.likely@xxxxxxxxxxxx> wrote: > > Moving it back into powerpc land is a step backwards. I've attached a > patch that makes it generic instead. It has been tested on ARM. > > I've pushed it out to the following branch: > > git://git.secretlab.ca/git/linux-2.6 irqdomain/merge I have pulled that into my fixes tree for today (since otherwise my builds will break). I have also added this patch to my fixes tree: From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Thu, 29 Mar 2012 14:58:10 +1100 Subject: [PATCH] powerpc: fix fallout from system.h split up Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- arch/powerpc/kernel/fadump.c | 2 ++ arch/powerpc/kernel/kgdb.c | 1 + 2 files changed, 3 insertions(+) diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c index cfe7a38..18bdf74 100644 --- a/arch/powerpc/kernel/fadump.c +++ b/arch/powerpc/kernel/fadump.c @@ -40,6 +40,8 @@ #include <asm/prom.h> #include <asm/rtas.h> #include <asm/fadump.h> +#include <asm/debug.h> +#include <asm/setup.h> static struct fw_dump fw_dump; static struct fadump_mem_struct fdm; diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c index 76a6e40..782bd0a 100644 --- a/arch/powerpc/kernel/kgdb.c +++ b/arch/powerpc/kernel/kgdb.c @@ -24,6 +24,7 @@ #include <asm/current.h> #include <asm/processor.h> #include <asm/machdep.h> +#include <asm/debug.h> /* * This table contains the mapping between PowerPC hardware trap types, and -- 1.7.9.5 -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpKuRZsz4ilZ.pgp
Description: PGP signature