From patchwork Wed Oct 6 07:18:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 234941 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o967GMib009775 for ; Wed, 6 Oct 2010 07:16:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932147Ab0JFHQW (ORCPT ); Wed, 6 Oct 2010 03:16:22 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:50894 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932110Ab0JFHQV (ORCPT ); Wed, 6 Oct 2010 03:16:21 -0400 Received: by mail-pw0-f46.google.com with SMTP id 5so1626982pwj.19 for ; Wed, 06 Oct 2010 00:16:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :in-reply-to:references:subject; bh=u8P49K2E3P4jsA9ChgOLfhGyigvJrR/NpDN5MP9DKXk=; b=UlFuw+eir8st+EM1YQC3uMPilMWSrNCQaknkkM4sfg6lB/X/Ij+icbDXrzggWCZ2BC qGi0EPPVgwvi75maQPcE2RfhMumxX8pjw7+qrYRewDpFTfqu8msD04r+/BFzGjSvv1hl RrP2debDj2by/N5Yj6uImWR2L75r6e9sHIyno= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=b0/z8+SbmIPz5TospGbOPpkBSVLt0Lh5U9W0RKijRND2CYcBO2sWGHeIW2TmQ2+a+d DIJXSgfaWIbbENUjockp/xzleSkwmYdtU4pUeupb3sA/dNB5BAq9ABGaQX4yCty95FL1 le5W1r9IL+xocdzDBz37kem8H7GeP9LkYMnww= Received: by 10.142.215.6 with SMTP id n6mr774363wfg.415.1286349381658; Wed, 06 Oct 2010 00:16:21 -0700 (PDT) Received: from [127.0.0.1] (49.14.32.202.bf.2iij.net [202.32.14.49]) by mx.google.com with ESMTPS id q13sm516996wfc.17.2010.10.06.00.16.20 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 06 Oct 2010 00:16:21 -0700 (PDT) From: Magnus Damm To: linux@arm.linux.org.uk Cc: grant.likely@secretlab.ca, Magnus Damm , lethal@linux-sh.org, linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org Date: Wed, 06 Oct 2010 16:18:29 +0900 Message-Id: <20101006071829.28048.45307.sendpatchset@t400s> In-Reply-To: <20101006071731.28048.89938.sendpatchset@t400s> References: <20101006071731.28048.89938.sendpatchset@t400s> Subject: [PATCH 07/08] ARM: Add CONFIG_DEFAULT_IRQ_DEMUX Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 06 Oct 2010 07:16:22 +0000 (UTC) --- 0001/arch/arm/Kconfig +++ work/arch/arm/Kconfig 2010-10-05 20:36:45.000000000 +0900 @@ -1337,6 +1337,9 @@ config SPARSE_IRQ number of off-chip IRQs will want to treat this as experimental until they have been independently verified. +config DEFAULT_IRQ_DEMUX + def_bool y + source "mm/Kconfig" config FORCE_MAX_ZONEORDER --- 0009/arch/arm/kernel/entry-armv.S +++ work/arch/arm/kernel/entry-armv.S 2010-10-05 20:34:16.000000000 +0900 @@ -128,8 +128,9 @@ __dabt_svc: UNWIND(.fnend ) ENDPROC(__dabt_svc) +#ifdef CONFIG_DEFAULT_IRQ_DEMUX __irq_svc default - +#endif .align 5 __und_svc: #ifdef CONFIG_KPROBES @@ -258,8 +259,9 @@ __dabt_usr: UNWIND(.fnend ) ENDPROC(__dabt_usr) +#ifdef CONFIG_DEFAULT_IRQ_DEMUX __irq_usr default - +#endif .align 5 __und_usr: usr_entry @@ -885,10 +887,17 @@ __stubs_start: .globl __stubs_irq __stubs_irq: +#ifdef CONFIG_DEFAULT_IRQ_DEMUX .long __irq_usr_default @ 0 (USR_26 / USR_32) .long __irq_invalid @ 1 (FIQ_26 / FIQ_32) .long __irq_invalid @ 2 (IRQ_26 / IRQ_32) .long __irq_svc_default @ 3 (SVC_26 / SVC_32) +#else + .long __irq_invalid @ 0 (USR_26 / USR_32) + .long __irq_invalid @ 1 (FIQ_26 / FIQ_32) + .long __irq_invalid @ 2 (IRQ_26 / IRQ_32) + .long __irq_invalid @ 3 (SVC_26 / SVC_32) +#endif .long __irq_invalid @ 4 .long __irq_invalid @ 5 .long __irq_invalid @ 6