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: 2875061 Return-Path: X-Original-To: patchwork-kvm@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 665BB9F478 for ; Wed, 11 Sep 2013 22:28:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E51B120328 for ; Wed, 11 Sep 2013 22:28:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D029620320 for ; Wed, 11 Sep 2013 22:28:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753631Ab3IKW2e (ORCPT ); Wed, 11 Sep 2013 18:28:34 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:48876 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751029Ab3IKW2d (ORCPT ); Wed, 11 Sep 2013 18:28:33 -0400 Received: by mail-pd0-f176.google.com with SMTP id q10so9741389pdj.7 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=UvwD5HYvAp/7l3dSyuW01UXMlmPvL6pCjSHaOUXOAU65yKiMdke6nEXah66+CFMNtR HK9xs9TaRRYk+5Em8PBUWqaeem/3dpn/OI0ozYqecnvndAZOWJudiOItim3XNgO3A+6k dny/RAmbEmlJ3E0uTpbDYYx+UR8U8jgVAzorh/zINz6BeKVSyp41H8dc08QhXB6nzWxJ egAPQoRjDFMOM9nKZPzQ0lsAeJTMvoOn0wVaAi65JWpOepYqA9K3RZC6Bh7uLJvGB5eV fstNmRW8JMz3E5mQz0lAbcWJxUNo6eNvOSS4AExwaO08dxJkVXtHwHT3LAS+T8GsL7PT Gxqg== X-Gm-Message-State: ALoCoQm2BFsg+YJg/4lyBFWFwEFiOWA8BR8RXKlLlo+0mVpG+a/7/JGtqD5LcpihuC+dhSG0GtYP 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 Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Olof Johansson 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 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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);