From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90D4AC433FF for ; Tue, 13 Aug 2019 09:02:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 63B9E20840 for ; Tue, 13 Aug 2019 09:02:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="sJbe/Q05" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728388AbfHMJCK (ORCPT ); Tue, 13 Aug 2019 05:02:10 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:37098 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728298AbfHMJCH (ORCPT ); Tue, 13 Aug 2019 05:02:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=vSsmTwo0pYDg/Keqc2lPRRb9AJTFTHC12NE431Nfy9s=; b=sJbe/Q05tGZmDbiai6+/ZqFQJK WY/Avrwxg3RAbLLdvawDsrPKhZrGPCYhdN3aps1hMzCEST398sBC6n8Rmz+O60nE/hULH/+i7en2x LPQI7n1S0SDceu5ECunaJG71IVYxXeUtwuMgpKBbkjUYeRcuA9HlTUAhI9vH19VYZIs3IcnYRkF2G b11f0dhzGLFxEzkbGHZoLU/YicY56WKSlzmBnAOc/8HpUpxeV4C3AaRJLpg/lSorDuXhZNCdn8l93 U3hOeQ+C805qRZK3RQQQKuokNO4zEHzUNPHSZRYT+Vrcu7Ctgwqay5uIp61bcXEmB997qwNa9zT4A nYzUw+1w==; Received: from [2001:4bb8:180:1ec3:c70:4a89:bc61:2] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hxSgt-0006XN-VM; Tue, 13 Aug 2019 09:02:04 +0000 From: Christoph Hellwig To: Catalin Marinas , Will Deacon , x86@kernel.org Cc: Dave Hansen , Andy Lutomirski , Peter Zijlstra , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/6] x86: remove the unused set_memory_wt function Date: Tue, 13 Aug 2019 11:01:45 +0200 Message-Id: <20190813090146.26377-6-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190813090146.26377-1-hch@lst.de> References: <20190813090146.26377-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Christoph Hellwig --- arch/x86/include/asm/set_memory.h | 1 - arch/x86/mm/pageattr.c | 17 ----------------- 2 files changed, 18 deletions(-) diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h index fd549c3ebb17..2ee8e469dcf5 100644 --- a/arch/x86/include/asm/set_memory.h +++ b/arch/x86/include/asm/set_memory.h @@ -40,7 +40,6 @@ int _set_memory_wt(unsigned long addr, int numpages); int _set_memory_wb(unsigned long addr, int numpages); int set_memory_uc(unsigned long addr, int numpages); int set_memory_wc(unsigned long addr, int numpages); -int set_memory_wt(unsigned long addr, int numpages); int set_memory_wb(unsigned long addr, int numpages); int set_memory_np(unsigned long addr, int numpages); int set_memory_4k(unsigned long addr, int numpages); diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 0e39b344556d..9acd568c4faa 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -1848,23 +1848,6 @@ int _set_memory_wt(unsigned long addr, int numpages) cachemode2pgprot(_PAGE_CACHE_MODE_WT), 0); } -int set_memory_wt(unsigned long addr, int numpages) -{ - int ret; - - ret = reserve_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE, - _PAGE_CACHE_MODE_WT, NULL); - if (ret) - return ret; - - ret = _set_memory_wt(addr, numpages); - if (ret) - free_memtype(__pa(addr), __pa(addr) + numpages * PAGE_SIZE); - - return ret; -} -EXPORT_SYMBOL_GPL(set_memory_wt); - int _set_memory_wb(unsigned long addr, int numpages) { /* WB cache mode is hard wired to all cache attribute bits being 0 */ -- 2.20.1