From patchwork Tue Mar 25 15:52:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 3888271 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6768DBF540 for ; Tue, 25 Mar 2014 15:53:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5BBA6201EC for ; Tue, 25 Mar 2014 15:53:25 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4231B201BF for ; Tue, 25 Mar 2014 15:53:24 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSTf5-00065x-4f; Tue, 25 Mar 2014 15:53:11 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSTf2-0000K3-OX; Tue, 25 Mar 2014 15:53:08 +0000 Received: from moutng.kundenserver.de ([212.227.17.24]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSTez-0000Jd-OA for linux-arm-kernel@lists.infradead.org; Tue, 25 Mar 2014 15:53:06 +0000 Received: from wuerfel.localnet (HSI-KBW-134-3-135-108.hsi14.kabel-badenwuerttemberg.de [134.3.135.108]) by mrelayeu.kundenserver.de (node=mreue102) with ESMTP (Nemesis) id 0Lx6wD-1X7vLH0NuD-016eae; Tue, 25 Mar 2014 16:52:26 +0100 From: Arnd Bergmann To: Thomas Gleixner Subject: [PATCH] Xen: do hv callback accounting only on x86 Date: Tue, 25 Mar 2014 16:52:25 +0100 Message-ID: <5057041.71iuvlcH4G@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.11.0-18-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V02:K0:AiCLgSaqK8PQNnzdiwJj5DzTLV4+T0766bScIJw21Cr 3I2z9HW9IeOwBW82yRWjryBzmL2/PWEHXPcKY8iDUnBnA2GD3u l9Eh4Y/uCkbVcexvkfgaqqM/qUOQ04+YRN5p3O4gLXtqLLlUc/ 3kz3rZ1eFIWzSbw2GtwyA7EEecuhxkRl4EW2k7LaXjDR93Qx2Z yqbkVCeHLcSAC6snBrVBRQpwamvD5DQfLRN0vFALQYso17j4lN BffQvP9zA75nuq9sz3bXEylaylLH1R1FtL5C6ISY1OZvXuOZRH He/Ni70I0tdahHhAH14yCcQvA5TTWd4HX8cHl8UXNeIlsMqJux arMJIe9p5/9GbqU57bfo= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140325_115306_012675_605453DD X-CRM114-Status: UNSURE ( 8.00 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: Konrad Rzeszutek Wilk , Peter Zijlstra , linux-kernel@vger.kernel.org, David Vrabel , Xen , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Patch 99c8b79d3c1 "xen: Add proper irq accounting for HYPERCALL vector" added a call to inc_irq_stat(irq_hv_callback_count) in common Xen code, however both the inc_irq_stat function and the irq_hv_callback_count counter are architecture specific. This makes the code build again on ARM by moving the call into the existing #ifdef CONFIG_X86. We may want to later do the same implementation on ARM that x86 has though. Signed-off-by: Arnd Bergmann Cc: Thomas Gleixner Cc: David Vrabel Cc: Peter Zijlstra Cc: Konrad Rzeszutek Wilk Cc: Xen diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c index 5dd2ddf..8b91c256 100644 --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@ -1235,6 +1235,7 @@ void xen_evtchn_do_upcall(struct pt_regs *regs) #ifdef CONFIG_X86 exit_idle(); #endif + inc_irq_stat(irq_hv_callback_count); __xen_evtchn_do_upcall(); diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c index d5a3de8..dfa12a4 100644 --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@ -1248,8 +1248,8 @@ void xen_evtchn_do_upcall(struct pt_regs *regs) irq_enter(); #ifdef CONFIG_X86 exit_idle(); -#endif inc_irq_stat(irq_hv_callback_count); +#endif __xen_evtchn_do_upcall();