From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anup Patel Subject: [PATCH 2/5] kvmtool: ARM64: Fix compile error for aarch64 Date: Tue, 5 Aug 2014 14:19:56 +0530 Message-ID: <1407228599-25065-3-git-send-email-anup.patel@linaro.org> References: <1407228599-25065-1-git-send-email-anup.patel@linaro.org> Cc: kvm@vger.kernel.org, patches@apm.com, will.deacon@arm.com, marc.zyngier@arm.com, penberg@kernel.org, christoffer.dall@linaro.org, pranavkumar@linaro.org, Anup Patel To: kvmarm@lists.cs.columbia.edu Return-path: Received: from mail-pa0-f47.google.com ([209.85.220.47]:39760 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932707AbaHEIun (ORCPT ); Tue, 5 Aug 2014 04:50:43 -0400 Received: by mail-pa0-f47.google.com with SMTP id kx10so1004857pab.6 for ; Tue, 05 Aug 2014 01:50:41 -0700 (PDT) In-Reply-To: <1407228599-25065-1-git-send-email-anup.patel@linaro.org> Sender: kvm-owner@vger.kernel.org List-ID: The __ARM64_SYS_REG() macro is already defined in uapi/asm/kvm.h of Linux-3.16-rcX hence remove it from arm/aarch64/kvm-cpu.c Signed-off-by: Pranavkumar Sawargaonkar Signed-off-by: Anup Patel --- tools/kvm/arm/aarch64/kvm-cpu.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tools/kvm/arm/aarch64/kvm-cpu.c b/tools/kvm/arm/aarch64/kvm-cpu.c index 71a2a3a..545171b 100644 --- a/tools/kvm/arm/aarch64/kvm-cpu.c +++ b/tools/kvm/arm/aarch64/kvm-cpu.c @@ -19,17 +19,6 @@ (((x) << KVM_REG_ARM64_SYSREG_ ## n ## _SHIFT) & \ KVM_REG_ARM64_SYSREG_ ## n ## _MASK) -#define __ARM64_SYS_REG(op0,op1,crn,crm,op2) \ - (KVM_REG_ARM64 | KVM_REG_SIZE_U64 | \ - KVM_REG_ARM64_SYSREG | \ - ARM64_SYS_REG_SHIFT_MASK(op0, OP0) | \ - ARM64_SYS_REG_SHIFT_MASK(op1, OP1) | \ - ARM64_SYS_REG_SHIFT_MASK(crn, CRN) | \ - ARM64_SYS_REG_SHIFT_MASK(crm, CRM) | \ - ARM64_SYS_REG_SHIFT_MASK(op2, OP2)) - -#define ARM64_SYS_REG(...) __ARM64_SYS_REG(__VA_ARGS__) - unsigned long kvm_cpu__get_vcpu_mpidr(struct kvm_cpu *vcpu) { struct kvm_one_reg reg; -- 1.7.9.5