From patchwork Fri Sep 25 22:19:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 34321 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 64791B7BCC for ; Sat, 26 Sep 2009 08:22:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753111AbZIYWUi (ORCPT ); Fri, 25 Sep 2009 18:20:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753207AbZIYWUa (ORCPT ); Fri, 25 Sep 2009 18:20:30 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:43119 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752825AbZIYWUZ (ORCPT ); Fri, 25 Sep 2009 18:20:25 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n8PMJWoN024963 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 25 Sep 2009 15:19:34 -0700 Received: from akpm.mtv.corp.google.com (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with SMTP id n8PMJWq8001382; Fri, 25 Sep 2009 15:19:32 -0700 Date: Fri, 25 Sep 2009 15:19:32 -0700 From: Andrew Morton To: David Miller Cc: sam@ravnborg.org, sparclinux@vger.kernel.org, hch@lst.de Subject: Re: [patch 1/1] sparc32: convert to asm-generic/hardirq.h Message-Id: <20090925151932.3bcd5363.akpm@linux-foundation.org> In-Reply-To: <20090925.145947.160102410.davem@davemloft.net> References: <20090925144214.07985ee3.akpm@linux-foundation.org> <20090925215011.GA3532@merkur.ravnborg.org> <20090925145618.e40c4857.akpm@linux-foundation.org> <20090925.145947.160102410.davem@davemloft.net> X-Mailer: Sylpheed version 2.2.4 (GTK+ 2.8.20; i486-pc-linux-gnu) Mime-Version: 1.0 X-Spam-Status: No, hits=-3.513 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org On Fri, 25 Sep 2009 14:59:47 -0700 (PDT) David Miller wrote: > From: Andrew Morton > Date: Fri, 25 Sep 2009 14:56:18 -0700 > > > Dave, could you please send along the config which broke Christoph's > > patch? It works OK with allnoconfig and defconfig for me. > > arch/sparc/configs/sparc32_defconfig OK. In file included from include/asm-generic/hardirq.h:6, from /usr/src/devel/arch/sparc/include/asm/hardirq_32.h:11, from /usr/src/devel/arch/sparc/include/asm/hardirq.h:6, from include/linux/hardirq.h:10, from include/linux/interrupt.h:12, from /usr/src/devel/arch/sparc/include/asm/irq_32.h:9, from /usr/src/devel/arch/sparc/include/asm/irq.h:6, from include/linux/nmi.h:8, from kernel/sched.c:31: How's this fix look? arch/sparc/include/asm/irq_32.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN arch/sparc/include/asm/irq_32.h~a arch/sparc/include/asm/irq_32.h --- a/arch/sparc/include/asm/irq_32.h~a +++ a/arch/sparc/include/asm/irq_32.h @@ -6,10 +6,10 @@ #ifndef _SPARC_IRQ_H #define _SPARC_IRQ_H -#include - #define NR_IRQS 16 +#include + #define irq_canonicalize(irq) (irq) extern void __init init_IRQ(void);