Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp201278pxb; Wed, 14 Apr 2021 13:03:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTLdNnml3aelDrhC/VymZLmT2YZplWcgHQhpkMZ5RI7IVYhmFFck3YVDt+ABytQRm1ggwM X-Received: by 2002:a17:906:8921:: with SMTP id fr33mr546777ejc.151.1618430587345; Wed, 14 Apr 2021 13:03:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618430587; cv=none; d=google.com; s=arc-20160816; b=MZesHVcoROBJ3gonQM7NwEdcqQB10AkrCeN2JqTPcCXsdoyUdQCf9MedWUdBkTYnnz zveCZtRRGudYrqo6Jei8YaR6LWUr+tl9C5shbth+R5ta3s878MlycHN5rINaRUd5+b7z Qxva4mJ56lp0klJc/aOo7QZp2oE3E/0AA4XIWxp+nwrQ2nGD5NTU3CIg9MpO31PoKIOv DOAcwDg7egL6Q3lDPPkJqulu4EchulcQwG+lCUa/WJeajPG75scIGDvBZi2JLcb3eaWZ oToj2OwFoxxh5jHhsaMCAchI9jCm9n87MTsbYoM30Zg5qH7OexDRPm+N6IsVH0clVH+S pnMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=EhG6yeO7qUBOcTbfLkvq3N6y048F47lyYY/h7j+ClSw=; b=b4q0ptJ2OAvjtR8lYFWgotqNtPZ3HrWkX2XnES7asMmA3Obo71zjan24MuXoIlzg2I VmZTOR2vy3FGLc8qxL147CJVIYa7y8fC3Jr0Xx45BlLfHo9P084vGybArU00Xs+oqj9i IYwp6cnDc/fWMpS2+R6swlGKXyTZ/cjP1VdSK8WYskIiCLY4641Q2B7q96YIqk+iyoQJ B8o7svflhXW5ZeLr+q83ylROO326Id2yANN33QSww3g4Ks/IDsQxtrgc+IO50nNbHFd7 H58VehCfBZEqrKxP0dZ6K4hSf0/DCYWoMby4YCbmCkpe7+rfji9fw9pE1is26nOicFD7 Ao9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=E5JYcrvg; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id lo4si264299ejb.222.2021.04.14.13.02.42; Wed, 14 Apr 2021 13:03:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=E5JYcrvg; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349755AbhDNHhG (ORCPT + 99 others); Wed, 14 Apr 2021 03:37:06 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:51420 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349754AbhDNHhE (ORCPT ); Wed, 14 Apr 2021 03:37:04 -0400 Date: Wed, 14 Apr 2021 07:36:41 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1618385802; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EhG6yeO7qUBOcTbfLkvq3N6y048F47lyYY/h7j+ClSw=; b=E5JYcrvgsNJJ82rYicVBYxqD3PcFxi1Ew4v8Z+dGBuq/3CMCKn6O3qA2ZoCCQNhLSCgsJS YZgebZfB2a6Q5VYOc8wiswRq7q1P1utq0eNuViaXkvJg0SemRFF9MVuqCcHDApNPO3ZH9l 7TxO23gfjrB40PE7lltuxkm44Jn+eNWzjp5J5kg8GEPgDzkQEMU1JGVmVhBtZfuTNGp9tQ NXQ5FUQ4duJuV4eBDqIjImSZbauDkImd02zexfQbTMzVLNA3qrR7sCWfjHpmE5rGFv4KFF 1CIKi/fg1ELX8xXcliTtkBNJFIrLuXlTt1j6YfheL4J1+FOwpxl60L2A9wOFXw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1618385802; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EhG6yeO7qUBOcTbfLkvq3N6y048F47lyYY/h7j+ClSw=; b=+u0ppabOu5v7QeHwJ97Z1Ba85OXPAE7n4hkukGEMfE8DpI8VLb3n7LkPrmgGipauFNuufQ EORG4MKZKz9wFfAA== From: "tip-bot2 for Jan Kiszka" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cleanups] x86/pat: Do not compile stubbed functions when X86_PAT is off Cc: Jan Kiszka , Borislav Petkov , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: MIME-Version: 1.0 Message-ID: <161838580104.29796.1278445228759289660.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 16854b567dff767e5ec5e6dc23021271136733a5 Gitweb: https://git.kernel.org/tip/16854b567dff767e5ec5e6dc23021271136733a5 Author: Jan Kiszka AuthorDate: Mon, 26 Oct 2020 18:39:06 +01:00 Committer: Borislav Petkov CommitterDate: Wed, 14 Apr 2021 08:21:41 +02:00 x86/pat: Do not compile stubbed functions when X86_PAT is off Those are already provided by linux/io.h as stubs. The conflict remains invisible until someone would pull linux/io.h into memtype.c. This fixes a build error when this file is used outside of the kernel tree. [ bp: Massage commit message. ] Signed-off-by: Jan Kiszka Signed-off-by: Borislav Petkov Link: https://lkml.kernel.org/r/a9351615-7a0d-9d47-af65-d9e2fffe8192@siemens.com --- arch/x86/mm/pat/memtype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/mm/pat/memtype.c b/arch/x86/mm/pat/memtype.c index 6084d14..3112ca7 100644 --- a/arch/x86/mm/pat/memtype.c +++ b/arch/x86/mm/pat/memtype.c @@ -800,6 +800,7 @@ void memtype_free_io(resource_size_t start, resource_size_t end) memtype_free(start, end); } +#ifdef CONFIG_X86_PAT int arch_io_reserve_memtype_wc(resource_size_t start, resource_size_t size) { enum page_cache_mode type = _PAGE_CACHE_MODE_WC; @@ -813,6 +814,7 @@ void arch_io_free_memtype_wc(resource_size_t start, resource_size_t size) memtype_free_io(start, start + size); } EXPORT_SYMBOL(arch_io_free_memtype_wc); +#endif pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, unsigned long size, pgprot_t vma_prot)