From patchwork Wed Oct 2 21:22:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 280179 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2FCFF2C00C5 for ; Thu, 3 Oct 2013 07:22:25 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754315Ab3JBVWY (ORCPT ); Wed, 2 Oct 2013 17:22:24 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:54505 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754242Ab3JBVWX (ORCPT ); Wed, 2 Oct 2013 17:22:23 -0400 Received: by mail-pa0-f42.google.com with SMTP id lj1so1611671pab.29 for ; Wed, 02 Oct 2013 14:22:22 -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=ANhzKBYvKxNvig6jkMSQbICG3T5alZ2/9zo9ZCRRo1w=; b=QmqE+DsRKHcO3ce0SgsJA0dAmOSpnvcx1Z4mbxzXNjINtuh6G456hF/4KLz2eaaqZJ 8IanGTcJNGfakYIjvK8WiSfydXLut4KJxeN0iOVs+t4gcu1FvaquZ3iatSccBzib76dQ QdXhTYAyu5CIASiVPwQQX55GkyDNndfQcBll88S06lhjWyLLEwssZvefuPLGOovrwEEg aldQWVo6j29yUYg/1ieoAxv5+byuGbwJUkyxr3CJgTnmEv3uVeuBgsXxRrgX5eTt+O8S +mYOH9NghYq33YWAqTPTSHQje8xixsnYSB8pdUucqtrMtjNJTg1ZhZ0JhVALn5oDK5k1 n0sA== X-Gm-Message-State: ALoCoQkuN9tWPynqDlGRPNYGaWmO2iaIz6pOtYa2Wz4qVRNmAzHOsZTCI4Pp0P/Od3FTXrA+PbrK X-Received: by 10.66.150.41 with SMTP id uf9mr5499152pab.108.1380748942376; Wed, 02 Oct 2013 14:22:22 -0700 (PDT) Received: from localhost.localdomain (c-67-169-181-221.hsd1.ca.comcast.net. [67.169.181.221]) by mx.google.com with ESMTPSA id fl3sm5678147pad.10.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Oct 2013 14:22:21 -0700 (PDT) From: Christoffer Dall To: kvm@vger.kernel.org Cc: kvmarm@lists.cs.columbia.edu, kvm-ppc@vger.kernel.org, kvm-ia64@vger.kernel.org, Christoffer Dall Subject: [PATCH 2/6] KVM: ARM: Get rid of KVM_HPAGE defines Date: Wed, 2 Oct 2013 14:22:29 -0700 Message-Id: <1380748953-7864-3-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1380748953-7864-1-git-send-email-christoffer.dall@linaro.org> References: <1380748953-7864-1-git-send-email-christoffer.dall@linaro.org> Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org The KVM_HPAGE_DEFINES are a little artificial on ARM, since the huge page size is statically defined at compile time and there is only a single huge page size. Now when the main kvm code relying on these defines has been moved to the x86 specific part of the world, we can get rid of these. Signed-off-by: Christoffer Dall --- arch/arm/include/asm/kvm_host.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 7d22517..e45a74b 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -38,11 +38,6 @@ #define KVM_VCPU_MAX_FEATURES 1 -/* We don't currently support large pages. */ -#define KVM_HPAGE_GFN_SHIFT(x) 0 -#define KVM_NR_PAGE_SIZES 1 -#define KVM_PAGES_PER_HPAGE(x) (1UL<<31) - #include struct kvm_vcpu;