From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mmgR7-00GdXA-UO for linux-um@lists.infradead.org; Mon, 15 Nov 2021 18:10:35 +0000 From: Greg Kroah-Hartman Subject: [PATCH 5.14 441/849] media: ivtv: fix build for UML Date: Mon, 15 Nov 2021 17:58:44 +0100 Message-Id: <20211115165435.202407518@linuxfoundation.org> In-Reply-To: <20211115165419.961798833@linuxfoundation.org> References: <20211115165419.961798833@linuxfoundation.org> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-um" Errors-To: linux-um-bounces+geert=linux-m68k.org@lists.infradead.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , Johannes Berg , Andy Walls , linux-um@lists.infradead.org, Richard Weinberger , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin RnJvbTogUmFuZHkgRHVubGFwIDxyZHVubGFwQGluZnJhZGVhZC5vcmc+CgpbIFVwc3RyZWFtIGNv bW1pdCA2Y2I2N2JlYTk0NWJkZjBhZDQwZTYzM2NkMmQ5ZmJlYjA4NTU2NzViIF0KClByZXZlbnQg dGhlIHVzZSBvZiBwYWdlIHRhYmxlIG1hY3JvcyBhbmQgdHlwZXMgZnJvbSAyIGNvbmZsaWN0aW5n CnBsYWNlcy4gVGhpcyBmaXhlcyBtdWx0aXBsZSBidWlsZCBlcnJvcnMgYW5kIHdhcm5pbmdzLCBl LmcuOgoKLi4vYXJjaC94ODYvaW5jbHVkZS9hc20vcGd0YWJsZV82NF90eXBlcy5oOjIxOjM0OiBl cnJvcjogY29uZmxpY3RpbmcgdHlwZXMgZm9yIOKAmHB0ZV904oCZCiB0eXBlZGVmIHN0cnVjdCB7 IHB0ZXZhbF90IHB0ZTsgfSBwdGVfdDsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IF5+fn5+CkluIGZpbGUgaW5jbHVkZWQgZnJvbSAuLi9pbmNsdWRlL2xpbnV4L21tX3R5cGVzX3Rh c2suaDoxNjowLAogICAgICAgICAgICAgICAgIGZyb20gLi4vaW5jbHVkZS9saW51eC9tbV90eXBl cy5oOjUsCiAgICAgICAgICAgICAgICAgZnJvbSAuLi9pbmNsdWRlL2xpbnV4L2J1aWxkaWQuaDo1 LAogICAgICAgICAgICAgICAgIGZyb20gLi4vaW5jbHVkZS9saW51eC9tb2R1bGUuaDoxNCwKICAg ICAgICAgICAgICAgICBmcm9tIC4uL2RyaXZlcnMvbWVkaWEvcGNpL2l2dHYvaXZ0di1kcml2ZXIu aDo0MCwKICAgICAgICAgICAgICAgICBmcm9tIC4uL2RyaXZlcnMvbWVkaWEvcGNpL2l2dHYvaXZ0 dmZiLmM6Mjk6Ci4uL2FyY2gvdW0vaW5jbHVkZS9hc20vcGFnZS5oOjU3OjM5OiBub3RlOiBwcmV2 aW91cyBkZWNsYXJhdGlvbiBvZiDigJhwdGVfdOKAmSB3YXMgaGVyZQogdHlwZWRlZiBzdHJ1Y3Qg eyB1bnNpZ25lZCBsb25nIHB0ZTsgfSBwdGVfdDsKCi4uL2FyY2gveDg2L2luY2x1ZGUvYXNtL3Bn dGFibGVfdHlwZXMuaDoyODQ6NDM6IGVycm9yOiBleHBlY3RlZCDigJgp4oCZIGJlZm9yZSDigJhw cm904oCZCiBzdGF0aWMgaW5saW5lIHBncHJvdF90IHBncHJvdF9ueChwZ3Byb3RfdCBwcm90KQog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXgouLi9pbmNsdWRlL2xp bnV4L3BndGFibGUuaDo5MTQ6MjY6IG5vdGU6IGluIGRlZmluaXRpb24gb2YgbWFjcm8g4oCYcGdw cm90X2544oCZCiAjZGVmaW5lIHBncHJvdF9ueChwcm90KSAocHJvdCkKICAgICAgICAgICAgICAg ICAgICAgICAgICBefn5+CkluIGZpbGUgaW5jbHVkZWQgZnJvbSAuLi9hcmNoL3g4Ni9pbmNsdWRl L2FzbS9tZW10eXBlLmg6NjowLAogICAgICAgICAgICAgICAgIGZyb20gLi4vZHJpdmVycy9tZWRp YS9wY2kvaXZ0di9pdnR2ZmIuYzo0MDoKLi4vYXJjaC94ODYvaW5jbHVkZS9hc20vcGd0YWJsZV90 eXBlcy5oOjI4ODowOiB3YXJuaW5nOiAicGdwcm90X254IiByZWRlZmluZWQKICNkZWZpbmUgcGdw cm90X254IHBncHJvdF9ueAoKLi4vYXJjaC94ODYvaW5jbHVkZS9hc20vcGFnZV90eXBlcy5oOjEx OjA6IHdhcm5pbmc6ICJQQUdFX1NJWkUiIHJlZGVmaW5lZAogI2RlZmluZSBQQUdFX1NJWkUgIChf QUMoMSxVTCkgPDwgUEFHRV9TSElGVCkKCkluIGZpbGUgaW5jbHVkZWQgZnJvbSAuLi9pbmNsdWRl L2xpbnV4L21tX3R5cGVzX3Rhc2suaDoxNjowLAogICAgICAgICAgICAgICAgIGZyb20gLi4vaW5j bHVkZS9saW51eC9tbV90eXBlcy5oOjUsCiAgICAgICAgICAgICAgICAgZnJvbSAuLi9pbmNsdWRl L2xpbnV4L2J1aWxkaWQuaDo1LAogICAgICAgICAgICAgICAgIGZyb20gLi4vaW5jbHVkZS9saW51 eC9tb2R1bGUuaDoxNCwKICAgICAgICAgICAgICAgICBmcm9tIC4uL2RyaXZlcnMvbWVkaWEvcGNp L2l2dHYvaXZ0di1kcml2ZXIuaDo0MCwKICAgICAgICAgICAgICAgICBmcm9tIC4uL2RyaXZlcnMv bWVkaWEvcGNpL2l2dHYvaXZ0dmZiLmM6Mjk6Ci4uL2FyY2gvdW0vaW5jbHVkZS9hc20vcGFnZS5o OjE0OjA6IG5vdGU6IHRoaXMgaXMgdGhlIGxvY2F0aW9uIG9mIHRoZSBwcmV2aW91cyBkZWZpbml0 aW9uCiAjZGVmaW5lIFBBR0VfU0laRSAoX0FDKDEsIFVMKSA8PCBQQUdFX1NISUZUKQoKRml4ZXM6 IDY4ZjVkM2YzYjY1NCAoInVtOiBhZGQgUENJIG92ZXIgdmlydGlvIGVtdWxhdGlvbiBkcml2ZXIi KQpTaWduZWQtb2ZmLWJ5OiBSYW5keSBEdW5sYXAgPHJkdW5sYXBAaW5mcmFkZWFkLm9yZz4KQ2M6 IEpvaGFubmVzIEJlcmcgPGpvaGFubmVzQHNpcHNvbHV0aW9ucy5uZXQ+CkNjOiBBbmR5IFdhbGxz IDxhd2FsbHNAbWQubWV0cm9jYXN0Lm5ldD4KQ2M6IGxpbnV4LXVtQGxpc3RzLmluZnJhZGVhZC5v cmcKQ2M6IFJpY2hhcmQgV2VpbmJlcmdlciA8cmljaGFyZEBub2QuYXQ+ClNpZ25lZC1vZmYtYnk6 IEhhbnMgVmVya3VpbCA8aHZlcmt1aWwtY2lzY29AeHM0YWxsLm5sPgpTaWduZWQtb2ZmLWJ5OiBN YXVybyBDYXJ2YWxobyBDaGVoYWIgPG1jaGVoYWIraHVhd2VpQGtlcm5lbC5vcmc+ClNpZ25lZC1v ZmYtYnk6IFNhc2hhIExldmluIDxzYXNoYWxAa2VybmVsLm9yZz4KLS0tCiBkcml2ZXJzL21lZGlh L3BjaS9pdnR2L2l2dHZmYi5jIHwgNCArKy0tCiAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25z KCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvbWVkaWEvcGNpL2l2dHYv aXZ0dmZiLmMgYi9kcml2ZXJzL21lZGlhL3BjaS9pdnR2L2l2dHZmYi5jCmluZGV4IGUyZDU2ZGNh NWJlNDAuLjVhZDAzYjJhNTBiZGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvbWVkaWEvcGNpL2l2dHYv aXZ0dmZiLmMKKysrIGIvZHJpdmVycy9tZWRpYS9wY2kvaXZ0di9pdnR2ZmIuYwpAQCAtMzYsNyAr MzYsNyBAQAogI2luY2x1ZGUgPGxpbnV4L2ZiLmg+CiAjaW5jbHVkZSA8bGludXgvaXZ0dmZiLmg+ CiAKLSNpZmRlZiBDT05GSUdfWDg2XzY0CisjaWYgZGVmaW5lZChDT05GSUdfWDg2XzY0KSAmJiAh ZGVmaW5lZChDT05GSUdfVU1MKQogI2luY2x1ZGUgPGFzbS9tZW10eXBlLmg+CiAjZW5kaWYKIApA QCAtMTE1Nyw3ICsxMTU3LDcgQEAgc3RhdGljIGludCBpdnR2ZmJfaW5pdF9jYXJkKHN0cnVjdCBp dnR2ICppdHYpCiB7CiAJaW50IHJjOwogCi0jaWZkZWYgQ09ORklHX1g4Nl82NAorI2lmIGRlZmlu ZWQoQ09ORklHX1g4Nl82NCkgJiYgIWRlZmluZWQoQ09ORklHX1VNTCkKIAlpZiAocGF0X2VuYWJs ZWQoKSkgewogCQlpZiAoaXZ0dmZiX2ZvcmNlX3BhdCkgewogCQkJcHJfaW5mbygiUEFUIGlzIGVu YWJsZWQuIFdyaXRlLWNvbWJpbmVkIGZyYW1lYnVmZmVyIGNhY2hpbmcgd2lsbCBiZSBkaXNhYmxl ZC5cbiIpOwotLSAKMi4zMy4wCgoKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpsaW51eC11bSBtYWlsaW5nIGxpc3QKbGludXgtdW1AbGlzdHMuaW5mcmFk ZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4 LXVtCg== 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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C18DC43219 for ; Mon, 15 Nov 2021 23:01:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3794360F9B for ; Mon, 15 Nov 2021 23:01:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351284AbhKOXD7 (ORCPT ); Mon, 15 Nov 2021 18:03:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:58126 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243235AbhKOSxo (ORCPT ); Mon, 15 Nov 2021 13:53:44 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 13B56633C0; Mon, 15 Nov 2021 18:10:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1636999833; bh=Lw0+NkiXf9T06Ew1A29Vd9r2UccXwd1i0OyZz3s9Xeo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CDKj8348ZLnTuKlVJ2XoPfGgPzTpJG7OcLMcv+8pjNpvL/9RCykVxUPeYdI6EiFeO 2FidbxrvFy47ZaxlQLo8qyQt5Rgh0URVQn/Qfd6uVVlTubNcXhlAHxni4mEZaEX/gm 9IiocPQnt9P+b6bqnu5CxEeqQ1mU3EUkMJLxNV/M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Randy Dunlap , Johannes Berg , Andy Walls , linux-um@lists.infradead.org, Richard Weinberger , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.14 441/849] media: ivtv: fix build for UML Date: Mon, 15 Nov 2021 17:58:44 +0100 Message-Id: <20211115165435.202407518@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115165419.961798833@linuxfoundation.org> References: <20211115165419.961798833@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap [ Upstream commit 6cb67bea945bdf0ad40e633cd2d9fbeb0855675b ] Prevent the use of page table macros and types from 2 conflicting places. This fixes multiple build errors and warnings, e.g.: ../arch/x86/include/asm/pgtable_64_types.h:21:34: error: conflicting types for ‘pte_t’ typedef struct { pteval_t pte; } pte_t; ^~~~~ In file included from ../include/linux/mm_types_task.h:16:0, from ../include/linux/mm_types.h:5, from ../include/linux/buildid.h:5, from ../include/linux/module.h:14, from ../drivers/media/pci/ivtv/ivtv-driver.h:40, from ../drivers/media/pci/ivtv/ivtvfb.c:29: ../arch/um/include/asm/page.h:57:39: note: previous declaration of ‘pte_t’ was here typedef struct { unsigned long pte; } pte_t; ../arch/x86/include/asm/pgtable_types.h:284:43: error: expected ‘)’ before ‘prot’ static inline pgprot_t pgprot_nx(pgprot_t prot) ^ ../include/linux/pgtable.h:914:26: note: in definition of macro ‘pgprot_nx’ #define pgprot_nx(prot) (prot) ^~~~ In file included from ../arch/x86/include/asm/memtype.h:6:0, from ../drivers/media/pci/ivtv/ivtvfb.c:40: ../arch/x86/include/asm/pgtable_types.h:288:0: warning: "pgprot_nx" redefined #define pgprot_nx pgprot_nx ../arch/x86/include/asm/page_types.h:11:0: warning: "PAGE_SIZE" redefined #define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT) In file included from ../include/linux/mm_types_task.h:16:0, from ../include/linux/mm_types.h:5, from ../include/linux/buildid.h:5, from ../include/linux/module.h:14, from ../drivers/media/pci/ivtv/ivtv-driver.h:40, from ../drivers/media/pci/ivtv/ivtvfb.c:29: ../arch/um/include/asm/page.h:14:0: note: this is the location of the previous definition #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver") Signed-off-by: Randy Dunlap Cc: Johannes Berg Cc: Andy Walls Cc: linux-um@lists.infradead.org Cc: Richard Weinberger Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/pci/ivtv/ivtvfb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/pci/ivtv/ivtvfb.c b/drivers/media/pci/ivtv/ivtvfb.c index e2d56dca5be40..5ad03b2a50bdb 100644 --- a/drivers/media/pci/ivtv/ivtvfb.c +++ b/drivers/media/pci/ivtv/ivtvfb.c @@ -36,7 +36,7 @@ #include #include -#ifdef CONFIG_X86_64 +#if defined(CONFIG_X86_64) && !defined(CONFIG_UML) #include #endif @@ -1157,7 +1157,7 @@ static int ivtvfb_init_card(struct ivtv *itv) { int rc; -#ifdef CONFIG_X86_64 +#if defined(CONFIG_X86_64) && !defined(CONFIG_UML) if (pat_enabled()) { if (ivtvfb_force_pat) { pr_info("PAT is enabled. Write-combined framebuffer caching will be disabled.\n"); -- 2.33.0