From patchwork Mon Sep 27 19:48:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 213252 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 o8RJlN8Y009350 for ; Mon, 27 Sep 2010 19:48:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933478Ab0I0Tsi (ORCPT ); Mon, 27 Sep 2010 15:48:38 -0400 Received: from mail-qw0-f46.google.com ([209.85.216.46]:60920 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933389Ab0I0Tsg convert rfc822-to-8bit (ORCPT ); Mon, 27 Sep 2010 15:48:36 -0400 Received: by qwh6 with SMTP id 6so3586379qwh.19 for ; Mon, 27 Sep 2010 12:48:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=/ZXIlc0sZhn5m8yrqmyIWcQeXfHZikAlCgjS74DiaDA=; b=Hs1sk8pg0byr5zLuoo1Ul+KSg91m9lcS+sku23v+gHXI7oJnRE8IDkkrAWBN5Q5IVz AnIej3Bkhkfbpad/yr0c+gcbd3R7GPo/dS9QRQZ3i/v3tA0Lwq7m2EZ4ciTKTJ54zae7 k5PMJvvxTrWNb1W5Svfootk/EwT2KMPFB4KIo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=TzumJcTvnsSA/0tVSZEB/93XOj3KjinbaX7Yyu+4Xqgn3libW+sxtv/Lz+Zd324qu4 NHvu2l00vgQk4uGxEs8sSLGaNepysH+u+wtPoFMfH5ktweShNlOtGtrc7+3PjaEbcidp uDSreqkilZtcAnr0DwzK0HeUEEoe14xY/vo+M= MIME-Version: 1.0 Received: by 10.224.60.213 with SMTP id q21mr5133329qah.353.1285616914993; Mon, 27 Sep 2010 12:48:34 -0700 (PDT) Received: by 10.229.81.71 with HTTP; Mon, 27 Sep 2010 12:48:34 -0700 (PDT) In-Reply-To: <20100908152036.643594727@linutronix.de> References: <20100908152036.643594727@linutronix.de> Date: Mon, 27 Sep 2010 21:48:34 +0200 Message-ID: Subject: Re: [RFC trollpatch 1/1] genirq: Remove the fits all and nothing __do_IRQ() code From: richard -rw- weinberger To: Thomas Gleixner Cc: LKML , Linus Torvalds , Andrew Morton , Ingo Molnar , Peter Zijlstra , Christoph Hellwig , linux-alpha@vger.kernel.org, linux-cris-kernel@axis.com, Haavard Skinnemoen , Tony Luck , linux-ia64@vger.kernel.org, Yoshinori Sato , Hirokazu Takata , Greg Ungerer , Jeff Dike , linux-parisc@vger.kernel.org, Chris Zankel , linux-arch@vger.kernel.org Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@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]); Mon, 27 Sep 2010 19:48:38 +0000 (UTC) diff --git a/arch/um/Kconfig.um b/arch/um/Kconfig.um index ec2b8da..ae950e0 100644 --- a/arch/um/Kconfig.um +++ b/arch/um/Kconfig.um @@ -147,3 +147,8 @@ config KERNEL_STACK_ORDER This option determines the size of UML kernel stacks. They will be 1 << order pages. The default is OK unless you're running Valgrind on UML, in which case, set this to 3. + +config GENERIC_HARDIRQS_NO__DO_IRQ + def_bool y + + diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index a3f0b04..3d44535 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c @@ -334,7 +334,7 @@ unsigned int do_IRQ(int irq, struct uml_pt_regs *regs) { struct pt_regs *old_regs = set_irq_regs((struct pt_regs *)regs); irq_enter(); - __do_IRQ(irq); + generic_handle_irq(irq); irq_exit(); set_irq_regs(old_regs); return 1;