From patchwork Tue Aug 16 23:28:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 9284987 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 21F9A607FD for ; Tue, 16 Aug 2016 23:32:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 136DC286F5 for ; Tue, 16 Aug 2016 23:32:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0873528788; Tue, 16 Aug 2016 23:32:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B0D6A286F5 for ; Tue, 16 Aug 2016 23:32:14 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bZnnV-0004c3-MC; Tue, 16 Aug 2016 23:29:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bZnnU-0004ay-6U for xen-devel@lists.xen.org; Tue, 16 Aug 2016 23:29:28 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id CC/7F-10347-7D1A3B75; Tue, 16 Aug 2016 23:29:27 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrKIsWRWlGSWpSXmKPExsVyMXThId1rCze HG+ycZ2Sx5ONiFgdGj6O7fzMFMEaxZuYl5VcksGb8XLKJqeAdR8Xyt/1sDYzb2bsYuTiEBCYy Sjw+t4uxi5GTg0VgHrPEvo3FIAkJgX5WiQ+XF7KAJCQEYiRuLVsKZVdLNF++zg5iCwkoSPyec IgJYtIKJonTr0+CJdgENCSe/JrBBmKLCEhLXPt8GWwDs0CJxN75P8BsYQFLifV9j9kgNqtKTH t+nAnE5hVwlOg/Po25i5EDaJmcxIL3PiBhTgEniaMvG6D2Oko0r5nONoFRYAEjwypGjeLUorL UIl0jc72kosz0jJLcxMwcXUMDU73c1OLixPTUnMSkYr3k/NxNjMDAqmdgYNzBeHWL3yFGSQ4m JVHemRM3hgvxJeWnVGYkFmfEF5XmpBYfYpTh4FCS4K1bsDlcSLAoNT21Ii0zBxjiMGkJDh4lE d4okDRvcUFibnFmOkTqFKMxx5bf19YycWybem8tkxBLXn5eqpQ4bzxIqQBIaUZpHtwgWOxdYp SVEuZlZGBgEOIpSC3KzSxBlX/FKM7BqCTMWwMyhSczrwRu3yugU5iATtGX3gBySkkiQkqqgTH a1qKZZW1c72GtSbxaV2aWKD+6n31t7uZz839Y8ShckFy8P8wmLNPAst/SOEVdl5f1l1zwNqf+ AzvuFL1+88xIRZGtV/T8QTOGd3nrfk0zsWZRCI/dPHfFFSlFe50zvxeEGhm+XH3i2xbHqLM2U 2eec3h7RSfp1cQuT069LQ+PNtsse2ElNUOJpTgj0VCLuag4EQC/aL3BuAIAAA== X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1471390165!54928208!1 X-Originating-IP: [209.85.161.194] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28274 invoked from network); 16 Aug 2016 23:29:26 -0000 Received: from mail-yw0-f194.google.com (HELO mail-yw0-f194.google.com) (209.85.161.194) by server-9.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 16 Aug 2016 23:29:26 -0000 Received: by mail-yw0-f194.google.com with SMTP id j12so4223856ywb.1 for ; Tue, 16 Aug 2016 16:29:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cardoe.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cm3qSKGzfA9Wdo4ESNPYdU9IRkFHwwv6tDM/1rjQZ/0=; b=TAFttdl2ayX66q0NwkFe8L7tR6XRRTDWkL78OZsj9+BjO0U0MgVbvTwcUvlLJpwboJ QEiZJDrf1ByM3TS8wqZQDMM5tkHLBndtpFJVJnt9UPeueCwxUnHO1kplGCjjiwgWsrNl 56er6jGwIqo5ZAltOtN2vr9jbtolzI7JxkHuc= 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=cm3qSKGzfA9Wdo4ESNPYdU9IRkFHwwv6tDM/1rjQZ/0=; b=iGoarxLegRtp/a1JKQoR/BaHUwQ0XZeYok0c33jQxPEG/9SfRabtfDnEibjwrZWMyS luqf6b4F1lorSjvf9BLulDUm9v9spfiCVog/Yxh3bB6ij0GQ1yqOKKGh+xcTywPYB0u6 eZCXTlPudjc7I1Ks0Xse84xVQ9MV+bHYuBlVpfm7PiG62Wckt7ktZ2rFfMrg/L+4GTeM LoRrPbRKP/ji1ygVdE4O6ALa/Gl1NSzfQQ439HPBWZAnTSqosb9TA23nVxltnAmD9jxD wedQSeeqYekY9EZgwn4tN9XrwEtsfL9dsye25rnnzYL+mdxoH17ZJOAPlB63EBEXgUQs Hcxg== X-Gm-Message-State: AEkoouuU9oeyMm6d7thX/AY0Eddo0k+uPLT6RjWelHGVQqUSJS2SRHX8tNlRbZGADFzzeQ== X-Received: by 10.129.156.72 with SMTP id t69mr28360539ywg.295.1471390165633; Tue, 16 Aug 2016 16:29:25 -0700 (PDT) Received: from swanson.attlocal.net (104-179-196-18.lightspeed.brhmal.sbcglobal.net. [104.179.196.18]) by smtp.gmail.com with ESMTPSA id p67sm14046603ywe.2.2016.08.16.16.29.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 16 Aug 2016 16:29:24 -0700 (PDT) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Tue, 16 Aug 2016 18:28:23 -0500 Message-Id: <1471390109-10407-4-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1471390109-10407-1-git-send-email-cardoe@cardoe.com> References: <1471390109-10407-1-git-send-email-cardoe@cardoe.com> Cc: Andrew Cooper , Doug Goldstein , Jan Beulich Subject: [Xen-devel] [PATCH 3/9] x86/mtrr: drop have_wrcomb() wrapper X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP The only call was always to the generic implementation. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- xen/arch/x86/cpu/mtrr/main.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/xen/arch/x86/cpu/mtrr/main.c b/xen/arch/x86/cpu/mtrr/main.c index ff908ad..5dd1f5d 100644 --- a/xen/arch/x86/cpu/mtrr/main.c +++ b/xen/arch/x86/cpu/mtrr/main.c @@ -77,12 +77,6 @@ static const char *mtrr_attrib_to_str(int x) return (x <= 6) ? mtrr_strings[x] : "?"; } -/* Returns non-zero if we have the write-combining memory type */ -static int have_wrcomb(void) -{ - return mtrr_generic_have_wrcomb(); -} - /* This function returns the number of variable MTRRs */ static void __init set_num_var_ranges(void) { @@ -324,7 +318,7 @@ int mtrr_add_page(unsigned long base, unsigned long size, } /* If the type is WC, check that this processor supports it */ - if ((type == MTRR_TYPE_WRCOMB) && !have_wrcomb()) { + if ((type == MTRR_TYPE_WRCOMB) && !mtrr_generic_have_wrcomb()) { printk(KERN_WARNING "mtrr: your processor doesn't support write-combining\n"); return -ENOSYS;