From patchwork Tue Sep 24 19:49:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 2935541 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 142A7BFF05 for ; Tue, 24 Sep 2013 19:50:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E2CFA2029B for ; Tue, 24 Sep 2013 19:50:23 +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 641922027D for ; Tue, 24 Sep 2013 19:50:22 +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 1VOYcV-00011s-5E; Tue, 24 Sep 2013 19:50:03 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VOYcN-0003G1-Iy; Tue, 24 Sep 2013 19:49:55 +0000 Received: from mail-pd0-f181.google.com ([209.85.192.181]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VOYc9-0003DR-Ah for linux-arm-kernel@lists.infradead.org; Tue, 24 Sep 2013 19:49:42 +0000 Received: by mail-pd0-f181.google.com with SMTP id g10so5063088pdj.12 for ; Tue, 24 Sep 2013 12:49:19 -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:in-reply-to :references; bh=s24rejElZ8+YMGFwE98a3MHDyNS5D5hHrdCYQelfHdc=; b=RkvK9KBTOUsVQCH8oOedz9/4dcSrp8/t7sss8/qcWIPt6qDdwrhis8M4oIUiUrv7B1 8LKCW+zqgsNyyccItlb8Yv2mNOU/ZmOkdznWsw77cUcRy8p6H1fxuvvy8uhrkuP9gqmr JBBCw6uvxqztW+e/FlF/4dUKytgPmpO28WgTwmLZHEsgLkP3j1fbmULH4nQBc+wUxVk6 D0MQXpPj/Rqrw40ZF/g15ouehmMeQC+n59Mr/nKQZQ2m9lzxHIYvFmh0n/O9MeVLUn9D 61ExszOxh8iZmhPiFY5JGvdWmTHX6Wt13wdNey/ExMhO6961vHEITSDKpV3SH/Mfoj/G U7sA== X-Gm-Message-State: ALoCoQmjzNLCK/0yPr3SpGcRSPqE3JSAsj0lWwfe6i/oM7xVzqp6ep4yBTkCxkbRiPex0SzzgtmJ X-Received: by 10.68.255.69 with SMTP id ao5mr28977355pbd.66.1380052159845; Tue, 24 Sep 2013 12:49:19 -0700 (PDT) Received: from localhost.localdomain (c-67-169-183-77.hsd1.ca.comcast.net. [67.169.183.77]) by mx.google.com with ESMTPSA id ar1sm42704224pbc.34.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 24 Sep 2013 12:49:19 -0700 (PDT) From: Christoffer Dall To: Gleb Natapov , Paolo Bonzini , kvm@vger.kernel.org Subject: [PATCH] ARM: kvm: rename cpu_reset to avoid name clash Date: Tue, 24 Sep 2013 12:49:20 -0700 Message-Id: <1380052160-20755-2-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1380052160-20755-1-git-send-email-christoffer.dall@linaro.org> References: <1380052160-20755-1-git-send-email-christoffer.dall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130924_154941_476136_8B7AD0BF X-CRM114-Status: GOOD ( 11.66 ) X-Spam-Score: -1.9 (-) Cc: Russell King , stable@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Olof Johansson , kvmarm@lists.cs.columbia.edu, Christoffer Dall 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=-6.5 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 From: Olof Johansson cpu_reset is already #defined in as processor.reset, so it expands here and causes problems. Cc: Signed-off-by: Olof Johansson Signed-off-by: Christoffer Dall --- 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);