Hi all, On Thu, 29 Mar 2012 13:55:55 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > On Thu, 29 Mar 2012 13:50:44 +1100 Michael Neuling <mikey@xxxxxxxxxxx> wrote: > > > > > Here are a bunch of patches to disintegrate asm/system.h into a set of separate > > > bits to relieve the problem of circular inclusion dependencies. > > > > > > The following changes since commit 437538267b672f9320833907f1b5acbb2605f4be: > > > > > > Merge tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6 (2012-03-22 20:43:40 -0700) > > > > > > are available in the git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system.git split-asm-system_h > > > > It would have been nice to have this in linux-next for a day or two to > > sort out the merge issues, hence.... > > Um, what can I say but "yeah, it would have been nice" :-( The following patch fixes (as much as possible) a powerpc allyesconfig build. 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 + kernel/irq/irqdomain.c | 3 +++ 3 files changed, 6 insertions(+), 0 deletions(-) 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 diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index af48e59..1f94ddf 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -12,6 +12,9 @@ #include <linux/slab.h> #include <linux/smp.h> #include <linux/fs.h> +#ifdef CONFIG_VIRQ_DEBUG +#include <asm/debug.h> +#endif #define IRQ_DOMAIN_MAP_LEGACY 0 /* driver allocated fixed range of irqs. * ie. legacy 8259, gets irqs 1..15 */ -- 1.7.9.1 -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgprQRs0Zy5Th.pgp
Description: PGP signature
