From patchwork Wed Sep 11 22:27:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 2875071 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BD0829F478 for ; Wed, 11 Sep 2013 22:29:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4936120328 for ; Wed, 11 Sep 2013 22:29:21 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3B29520320 for ; Wed, 11 Sep 2013 22:29:20 +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 1VJsuC-0003Qq-KT; Wed, 11 Sep 2013 22:29:00 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VJsuA-0003nM-DN; Wed, 11 Sep 2013 22:28:58 +0000 Received: from mail-pd0-f171.google.com ([209.85.192.171]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VJsu7-0003m6-1Q for linux-arm-kernel@lists.infradead.org; Wed, 11 Sep 2013 22:28:56 +0000 Received: by mail-pd0-f171.google.com with SMTP id g10so9822034pdj.16 for ; Wed, 11 Sep 2013 15:28:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=tS6yS2m428skvFQ6OpwSWE0SFaW4HDnrm3ThDzrCkuM=; b=iOvU0Hzk3gPw7BO5WkZP67gz6BMAJMBXd4fdNK+vlI2CAKY6yud27vMMlc+So6GgWp IjXa4jIRrPNX9XaclEh3xGyT6heiDV05FZv6pkf2r3lm+DsYvdQ+cBjdvPooo9dtNCNR l0gKQHz+RdVJnkVl5p3Q/dX5enE4k9WOybwxsdEIq126+lIA5JXCCiFteuBGgFlq5eSF GRgCLoYRUfpudFYKznkLf4oR/IZk5kbnWA7McylYm/Kjx9uQWEOlS6M9JkoC+jtlyLX7 Dv/47yUjdHVh47Ier6eWrjCwfjZO84QaC24QNJCSDqhjmG79Et5W5BC4kyMpL9UKFMYM 8cew== X-Gm-Message-State: ALoCoQkHX+QQUd/KRP2OSm4diVycJJ6B6GkG+8WNvF+QCtJ+HG8PFoXgiYS/D/GDz7mcPNSI0kIc X-Received: by 10.66.145.132 with SMTP id su4mr6175592pab.11.1378938513180; Wed, 11 Sep 2013 15:28:33 -0700 (PDT) Received: from quad.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPSA id kd1sm6017008pab.20.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Sep 2013 15:28:32 -0700 (PDT) From: Olof Johansson To: Christoffer Dall Subject: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash Date: Wed, 11 Sep 2013 15:27:41 -0700 Message-Id: <1378938461-10835-1-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.8.1.192.gc4361b8 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130911_182855_164913_924824FF X-CRM114-Status: GOOD ( 10.23 ) X-Spam-Score: 0.6 (/) Cc: linux-arm-kernel@lists.infradead.org, Olof Johansson , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD,SUSPICIOUS_RECIPS,UNPARSEABLE_RELAY autolearn=ham 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 cpu_reset is already #defined in as processor.reset, so it expands here and causes problems. Signed-off-by: Olof Johansson --- arch/arm/kvm/reset.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/kvm/reset.c b/arch/arm/kvm/reset.c index 71e08ba..c02ba4a 100644 --- a/arch/arm/kvm/reset.c +++ b/arch/arm/kvm/reset.c @@ -58,14 +58,14 @@ static const struct kvm_irq_level a15_vtimer_irq = { */ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) { - struct kvm_regs *cpu_reset; + struct kvm_regs *reset_regs; const struct kvm_irq_level *cpu_vtimer_irq; switch (vcpu->arch.target) { case KVM_ARM_TARGET_CORTEX_A15: if (vcpu->vcpu_id > a15_max_cpu_idx) return -EINVAL; - cpu_reset = &a15_regs_reset; + reset_regs = &a15_regs_reset; vcpu->arch.midr = read_cpuid_id(); cpu_vtimer_irq = &a15_vtimer_irq; break; @@ -74,7 +74,7 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) } /* Reset core registers */ - memcpy(&vcpu->arch.regs, cpu_reset, sizeof(vcpu->arch.regs)); + memcpy(&vcpu->arch.regs, reset_regs, sizeof(vcpu->arch.regs)); /* Reset CP15 registers */ kvm_reset_coprocs(vcpu);