linux-arch.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael Neuling <mikey@neuling.org>
To: David Howells <dhowells@redhat.com>,
	Grant Likely <grant.likely@secretlab.ca>
Cc: 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,
	sfr@canb.auug.org.au
Subject: Re: [GIT PULL] Disintegrate and kill asm/system.h
Date: Thu, 29 Mar 2012 13:50:44 +1100	[thread overview]
Message-ID: <30702.1332989444@neuling.org> (raw)
In-Reply-To: <5599.1332958811@redhat.com>

> 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....

This seems to have broken linus tree when compiling a pseries_defconfig

We are currently getting:
kernel/irq/irqdomain.c: In function 'irq_debugfs_init':
kernel/irq/irqdomain.c:698:63: error: 'powerpc_debugfs_root' undeclared (first use in this function)
kernel/irq/irqdomain.c:698:63: note: each undeclared identifier is reported only once for each function it appears in

  ae3a197 Disintegrate asm/system.h for PowerPC
is conflicting with 
  cc79ca6 irq_domain: Move irq_domain code from powerpc to kernel/irq
from Grant's tree.

Adding the following patch fixes it for pseries_defconfig, although I'm
not sure it's the right fix.

Grant: why does powerpc_debugfs_root appear in generic code?  This seems
very bogus.

Mikey

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index af48e59..3ebf4ef 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -12,6 +12,7 @@
 #include <linux/slab.h>
 #include <linux/smp.h>
 #include <linux/fs.h>
+#include <asm/debug.h>
 
 #define IRQ_DOMAIN_MAP_LEGACY 0 /* driver allocated fixed range of irqs.
 				 * ie. legacy 8259, gets irqs 1..15 */

  reply	other threads:[~2012-03-29  2: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 [this message]
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
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=30702.1332989444@neuling.org \
    --to=mikey@neuling.org \
    --cc=akpm@linux-foundation.org \
    --cc=arnd@arndb.de \
    --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=paul.gortmaker@windriver.com \
    --cc=sfr@canb.auug.org.au \
    --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).