From patchwork Fri Aug 9 04:07:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 2841668 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 16FBABF546 for ; Fri, 9 Aug 2013 04:08:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5088B2046B for ; Fri, 9 Aug 2013 04:08:48 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6BDD72045B for ; Fri, 9 Aug 2013 04:08:47 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V7dzz-0008SL-W0; Fri, 09 Aug 2013 04:08:24 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V7dzo-0001sd-RU; Fri, 09 Aug 2013 04:08:12 +0000 Received: from mail-pb0-f43.google.com ([209.85.160.43]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V7dzU-0001ov-Bl for linux-arm-kernel@lists.infradead.org; Fri, 09 Aug 2013 04:07:53 +0000 Received: by mail-pb0-f43.google.com with SMTP id md4so4246491pbc.16 for ; Thu, 08 Aug 2013 21:07:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ANhzKBYvKxNvig6jkMSQbICG3T5alZ2/9zo9ZCRRo1w=; b=Ygk4AO75jPmdEOvOR+INBf4S0OFn0JERJhq9PlPZUEzWgHr92cSSO1SIbE1eAFubIM 0G0ppvqrKTEcpN3b6kWA/qxNroNjoCIgHDRxD2vFq6ojMaKZ1/zBmXiIp+p1NSHs0aEa XN8hvJdkkH8W822bNMSQNMJJn+NOZITjJtjoZNhHKXELwsy+RynD5AmlzsMOriEkcjU+ xuOyWyES5uVD4n9hfzrDOHo/Uw8z4Jy8Lp6mcyNMi5049q7Lo9BrVMwgOQjh6OferCNH i5vwlmmGwFhNhbZCBAV7/HMSVHqPep19ekGtQixLHBVMRbMZYosoaIoCkReyPXTEroIp ZO2Q== X-Gm-Message-State: ALoCoQkEBGCEn76mh7m4zD/sa/uJdBzRZd2UbiYgMMQfJ4ToQrlnU8hA0QgguTQCwt8klDEiMnKM X-Received: by 10.66.178.143 with SMTP id cy15mr9483898pac.105.1376021251038; Thu, 08 Aug 2013 21:07:31 -0700 (PDT) Received: from localhost.localdomain (c-67-169-183-77.hsd1.ca.comcast.net. [67.169.183.77]) by mx.google.com with ESMTPSA id mr3sm17525229pbb.27.2013.08.08.21.07.29 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 Aug 2013 21:07:30 -0700 (PDT) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu Subject: [PATCH 2/3] KVM: ARM: Get rid of KVM_HPAGE_XXX defines Date: Thu, 8 Aug 2013 21:07:18 -0700 Message-Id: <1376021239-10532-3-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1376021239-10532-1-git-send-email-christoffer.dall@linaro.org> References: <1376021239-10532-1-git-send-email-christoffer.dall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130809_000752_543121_CA8860F7 X-CRM114-Status: UNSURE ( 9.89 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.1 (/) Cc: Christoffer Dall , linaro-kernel@lists.linaro.org, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, patches@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, SUSPICIOUS_RECIPS, UNPARSEABLE_RELAY autolearn=no 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 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;