From patchwork Wed May 11 13:29:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9070081 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1B2109F30C for ; Wed, 11 May 2016 13:33:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2E01F200D0 for ; Wed, 11 May 2016 13:33:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B9BC420114 for ; Wed, 11 May 2016 13:33:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932463AbcEKNcE (ORCPT ); Wed, 11 May 2016 09:32:04 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:37910 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932150AbcEKNb5 (ORCPT ); Wed, 11 May 2016 09:31:57 -0400 Received: by mail-wm0-f44.google.com with SMTP id g17so82936975wme.1 for ; Wed, 11 May 2016 06:31:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DUm2M4cVAoOSh0Ko9tD8Sty7TbtKwvh7FjdfybbI25s=; b=PxwEIh8fctMR3mjxdT+SRuKkhLDOO9WXkHKpV2sjBn5BUhjJ4FyrYr48OhBh3wGArO l0t4b5NmqMNvjFzrkQZtG/C+FFfmVlyfppbZR8kOAdlzpaAna3h+UNNXlPyuBRLXnjLC xTjj2QSoniexTC2SbuStboTeIWHzVekPOh++k= 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=DUm2M4cVAoOSh0Ko9tD8Sty7TbtKwvh7FjdfybbI25s=; b=XcS4/SdDEY1NJm5qkmOvgui0IOyw7Xm/K7mtmr15+7epWl4t3Ogi4bMd9ujsR2sCLJ ZTquhWb1lGENQgQkjVD4alVXfFivsmMxlYtux6cQYrbkJAte1yKGuw5q6f4vPGgJLfZB 1kHRFaOlpf14P0bzT9uAh28O//Nt3QkbXKFNIuJuVVpnXSLta9y+q/z7ZuD/p7cIdgB5 AjlHiJT3uCsg8RqzrnGAjQX7DryzClYHgfa6B2LtbVnYXv4TEssw4yYkjDJy6dUngoRy b4GCS/o7dXAtgdH8cbj31ErYjK+aKrkqCbeNop/PiMdLvb+0TTbR+3v+bJ+Wm4Ejdijc rJLw== X-Gm-Message-State: AOPr4FWy6Xom52pv8XMWu1tHSbhI9WCFxVgS4cvagQkk3bm2EL3ZlH+i984LXGu8CmjSe8Ub X-Received: by 10.28.157.202 with SMTP id g193mr144998wme.46.1462973515898; Wed, 11 May 2016 06:31:55 -0700 (PDT) Received: from localhost.localdomain ([94.18.191.146]) by smtp.gmail.com with ESMTPSA id 131sm8547278wmu.17.2016.05.11.06.31.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 May 2016 06:31:55 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Cc: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, Marc Zyngier , Suzuki K Poulose Subject: [PULL 06/29] kvm-arm: Remove kvm_pud_huge() Date: Wed, 11 May 2016 15:29:59 +0200 Message-Id: <1462973422-10021-7-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.1.2.330.g565301e.dirty In-Reply-To: <1462973422-10021-1-git-send-email-christoffer.dall@linaro.org> References: <1462973422-10021-1-git-send-email-christoffer.dall@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 From: Suzuki K Poulose Get rid of kvm_pud_huge() which falls back to pud_huge. Use pud_huge instead. Acked-by: Christoffer Dall Acked-by: Marc Zyngier Signed-off-by: Suzuki K Poulose --- arch/arm/kvm/mmu.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c index 7837f0a..d0c0ee9 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -45,8 +45,6 @@ static phys_addr_t hyp_idmap_vector; #define hyp_pgd_order get_order(PTRS_PER_PGD * sizeof(pgd_t)) -#define kvm_pud_huge(_x) pud_huge(_x) - #define KVM_S2PTE_FLAG_IS_IOMAP (1UL << 0) #define KVM_S2_FLAG_LOGGING_ACTIVE (1UL << 1) @@ -1077,7 +1075,7 @@ static void stage2_wp_puds(pgd_t *pgd, phys_addr_t addr, phys_addr_t end) next = kvm_pud_addr_end(addr, end); if (!pud_none(*pud)) { /* TODO:PUD not supported, revisit later if supported */ - BUG_ON(kvm_pud_huge(*pud)); + BUG_ON(pud_huge(*pud)); stage2_wp_pmds(pud, addr, next); } } while (pud++, addr = next, addr != end);