From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Grant Likely <grant.likely@secretlab.ca>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Michael Neuling <mikey@neuling.org>,
David Howells <dhowells@redhat.com>,
torvalds@linux-foundation.org, akpm@linux-foundation.org,
linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
paul.gortmaker@windriver.com, arnd@arndb.de, hpa@zytor.com
Subject: Re: [GIT PULL] Disintegrate and kill asm/system.h
Date: Fri, 30 Mar 2012 09:50:20 +1100 [thread overview]
Message-ID: <20120330095020.a2e01d86c2d09f186c53d63d@canb.auug.org.au> (raw)
In-Reply-To: <20120329210117.A9A073E06B4@localhost>
[-- Attachment #1: Type: text/plain, Size: 1690 bytes --]
Hi Grant,
On Thu, 29 Mar 2012 15:01:17 -0600 Grant Likely <grant.likely@secretlab.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@canb.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@canb.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@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-03-29 22:50 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-28 18:20 [GIT PULL] Disintegrate and kill asm/system.h David Howells
2012-03-29 2:50 ` Michael Neuling
2012-03-29 2:55 ` Stephen Rothwell
2012-03-29 4:15 ` Stephen Rothwell
2012-03-29 4:21 ` Michael Neuling
2012-03-29 4:24 ` Linus Torvalds
2012-03-29 4:42 ` Stephen Rothwell
2012-03-29 4:55 ` Michael Neuling
2012-03-29 5:02 ` Linus Torvalds
2012-03-29 8:11 ` Benjamin Herrenschmidt
2012-03-29 21:14 ` Grant Likely
2012-03-29 21:14 ` Grant Likely
2012-03-29 21:48 ` Thomas Gleixner
2012-03-29 22:16 ` Grant Likely
2012-03-29 4:14 ` Benjamin Herrenschmidt
2012-03-29 21:01 ` Grant Likely
2012-03-29 22:50 ` Stephen Rothwell [this message]
2012-03-29 22:52 ` Grant Likely
2012-03-29 23:38 ` Stephen Rothwell
2012-03-30 0:37 ` Grant Likely
2012-03-30 7:48 ` Paul Mundt
2012-03-30 21:46 ` Grant Likely
2012-03-30 21:46 ` Grant Likely
-- strict thread matches above, loose matches on Subject: below --
2012-03-21 17:14 David Howells
2012-03-21 23:06 ` Paul Gortmaker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120330095020.a2e01d86c2d09f186c53d63d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=dhowells@redhat.com \
--cc=grant.likely@secretlab.ca \
--cc=hpa@zytor.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mikey@neuling.org \
--cc=paul.gortmaker@windriver.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).