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 <pranavku...@linaro.org>
Signed-off-by: Anup Patel <anup.pa...@linaro.org>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to