From patchwork Wed Apr 4 15:31:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 7620 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id C09B323E5B for ; Wed, 4 Apr 2012 15:31:13 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 868D0A18973 for ; Wed, 4 Apr 2012 15:31:13 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so623238iag.11 for ; Wed, 04 Apr 2012 08:31:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=R/UlyFnE21KLhHdL5k3JlYkTRFvHYf0CigcGHgV9Cr4=; b=Uu0ckGIWEDruQw9/SswxKhBa3phnVyRSjd+LT0yw3zm03nNZff0NfBqXcNsUL8PcvU wRo0K7GtIjmbzM16nTYrH6KgPmDZ+Qol3QPt2vqWDUmWeKQb9vesCxB4YmDccqj3M3iW gTnvOvn9mZZsngEISMI+3kyDGBedn7+lbKlQuoHWDxM2ze4hEeOIPuwFMqiP5LDlzdsh oYP1g3ZxosAwaUVj0nYqidKfo1oDVpgWhbyUi3oxxsqudrNHsTO8N+nz7q2qR+gfJfj3 rhRrYjfL8c2qYCZOxNftNPaBDP8fHo8qvYTHQuhX35/Kr8UbIUytcIgfd+TaQlTQM68E xYpg== Received: by 10.50.156.229 with SMTP id wh5mr2064721igb.28.1333553473335; Wed, 04 Apr 2012 08:31:13 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.164.217 with SMTP id f25csp45103iby; Wed, 4 Apr 2012 08:31:10 -0700 (PDT) Received: by 10.68.238.137 with SMTP id vk9mr1651817pbc.119.1333553468938; Wed, 04 Apr 2012 08:31:08 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id rm7si348270pbc.208.2012.04.04.08.31.07 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 04 Apr 2012 08:31:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1SFSAp-0003Ic-Li; Wed, 04 Apr 2012 16:31:03 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: Paul Brook , Evgeny Voevodin , patches@linaro.org Subject: [PATCH 12/13] hw/arm_gic.c: gic_set_pending_private() is NVIC only Date: Wed, 4 Apr 2012 16:31:01 +0100 Message-Id: <1333553462-12633-13-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1333553462-12633-1-git-send-email-peter.maydell@linaro.org> References: <1333553462-12633-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQlVnNxHkSdGcB+gkrrbG8r4GGzVmMKv+S7byMzan10sEte0Xa8Az6QH8j+M74++jxhzELs0 The function gic_set_pending_private() is now used by the NVIC only (for the GIC we now set PPI interrupts via gpio lines and gic_set_irq()). So make it #ifdef NVIC and remove the 'attribute unused' annotation. Signed-off-by: Peter Maydell --- hw/arm_gic.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/arm_gic.c b/hw/arm_gic.c index a9da88a..f395e4b 100644 --- a/hw/arm_gic.c +++ b/hw/arm_gic.c @@ -185,8 +185,8 @@ static void gic_update(gic_state *s) } } -static void __attribute__((unused)) -gic_set_pending_private(gic_state *s, int cpu, int irq) +#ifdef NVIC +static void gic_set_pending_private(gic_state *s, int cpu, int irq) { int cm = 1 << cpu; @@ -197,6 +197,7 @@ gic_set_pending_private(gic_state *s, int cpu, int irq) GIC_SET_PENDING(irq, cm); gic_update(s); } +#endif /* Process a change in an external IRQ input. */ static void gic_set_irq(void *opaque, int irq, int level)