[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20120330095020.a2e01d86c2d09f186c53d63d@canb.auug.org.au>
Date: Fri, 30 Mar 2012 09:50:20 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Grant Likely <grant.likely@...retlab.ca>
Cc: Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Michael Neuling <mikey@...ling.org>,
David Howells <dhowells@...hat.com>,
torvalds@...ux-foundation.org, akpm@...ux-foundation.org,
linux-arch@...r.kernel.org, linux-kernel@...r.kernel.org,
paul.gortmaker@...driver.com, arnd@...db.de, hpa@...or.com
Subject: Re: [GIT PULL] Disintegrate and kill asm/system.h
Hi Grant,
On Thu, 29 Mar 2012 15:01:17 -0600 Grant Likely <grant.likely@...retlab.ca> 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@...b.auug.org.au>
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@...b.auug.org.au>
---
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@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists