From patchwork Tue Aug 5 08:49:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 4676551 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 7E56E9F37E for ; Tue, 5 Aug 2014 08:50:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BB6F92015A for ; Tue, 5 Aug 2014 08:50:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 001C420158 for ; Tue, 5 Aug 2014 08:50:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932711AbaHEIuq (ORCPT ); Tue, 5 Aug 2014 04:50:46 -0400 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) 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=PCFGnHfs4L7heSe6uruZkV/t0/BcCKJgloIxi0hljEY=; b=FOfEMXnyBwpM0xSp5Lzudq1jp3usveS9tVORwW27OLW8GPoPReXlOZMMLZ1bMRcL0Z nhUHxCLezJSwRTwuomxtBJqR/ivcv47D66hCYD50B3F2H6RnLdyx4vKu8iHjN8iQA2ym wQbKFpPeppXdkohJyqSQ/aFimoQiW1MPQmCPUYH4zsYeqgg1Xn6MUxWjccE7k5IP24NR +tYUCpN8GZUmh+RC2Fi6CQR/2vRQfdgF8Ewf8X1w0g6ShtmHXyQdhTKd9elU8gBz9u66 vZDJ0TlXtlkzJODbPmtcq/fwcbNAn35zKT4s42pa87/JtUyEWSVJXXx18lDEynDQgO+y yGuw== X-Gm-Message-State: ALoCoQmuN6lPDOCUnl5zrRg+ihM9EIQqI9xlr5FQ/d1ZcJfqoNoS0+UU/WComKDLO/iCTBE3ES4d X-Received: by 10.70.2.97 with SMTP id 1mr2542347pdt.23.1407228641506; Tue, 05 Aug 2014 01:50:41 -0700 (PDT) Received: from pnqlab006.amcc.com ([182.73.239.130]) by mx.google.com with ESMTPSA id oq3sm1273386pbb.14.2014.08.05.01.50.37 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 05 Aug 2014 01:50:40 -0700 (PDT) From: Anup Patel To: kvmarm@lists.cs.columbia.edu 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 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> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1407228599-25065-1-git-send-email-anup.patel@linaro.org> References: <1407228599-25065-1-git-send-email-anup.patel@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 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;