From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 2AE56212AAB8A for ; Wed, 26 Jun 2019 05:28:35 -0700 (PDT) From: Christoph Hellwig Subject: [PATCH 24/25] mm: remove the HMM config option Date: Wed, 26 Jun 2019 14:27:23 +0200 Message-Id: <20190626122724.13313-25-hch@lst.de> In-Reply-To: <20190626122724.13313-1-hch@lst.de> References: <20190626122724.13313-1-hch@lst.de> MIME-Version: 1.0 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" To: Dan Williams , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jason Gunthorpe , Ben Skeggs Cc: linux-nvdimm@lists.01.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mm@kvack.org, nouveau@lists.freedesktop.org List-ID: All the mm/hmm.c code is better keyed off HMM_MIRROR. Also let nouveau depend on it instead of the mix of a dummy dependency symbol plus the actually selected one. Drop various odd dependencies, as the code is pretty portable. Signed-off-by: Christoph Hellwig --- drivers/gpu/drm/nouveau/Kconfig | 3 +-- include/linux/hmm.h | 5 +---- include/linux/mm_types.h | 2 +- mm/Kconfig | 27 ++++----------------------- mm/Makefile | 2 +- mm/hmm.c | 2 -- 6 files changed, 8 insertions(+), 33 deletions(-) diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig index 6303d203ab1d..66c839d8e9d1 100644 --- a/drivers/gpu/drm/nouveau/Kconfig +++ b/drivers/gpu/drm/nouveau/Kconfig @@ -84,11 +84,10 @@ config DRM_NOUVEAU_BACKLIGHT config DRM_NOUVEAU_SVM bool "(EXPERIMENTAL) Enable SVM (Shared Virtual Memory) support" - depends on ARCH_HAS_HMM depends on DEVICE_PRIVATE depends on DRM_NOUVEAU + depends on HMM_MIRROR depends on STAGING - select HMM_MIRROR default n help Say Y here if you want to enable experimental support for diff --git a/include/linux/hmm.h b/include/linux/hmm.h index 3d00e9550e77..b697496e85ba 100644 --- a/include/linux/hmm.h +++ b/include/linux/hmm.h @@ -62,7 +62,7 @@ #include #include -#if IS_ENABLED(CONFIG_HMM) +#ifdef CONFIG_HMM_MIRROR #include #include @@ -332,9 +332,6 @@ static inline uint64_t hmm_pfn_from_pfn(const struct hmm_range *range, return hmm_device_entry_from_pfn(range, pfn); } - - -#if IS_ENABLED(CONFIG_HMM_MIRROR) /* * Mirroring: how to synchronize device page table with CPU page table. * diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index f33a1289c101..8d37182f8dbe 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -501,7 +501,7 @@ struct mm_struct { #endif struct work_struct async_put_work; -#if IS_ENABLED(CONFIG_HMM) +#ifdef CONFIG_HMM_MIRROR /* HMM needs to track a few things per mm */ struct hmm *hmm; #endif diff --git a/mm/Kconfig b/mm/Kconfig index eecf037a54b3..1e426c26b1d6 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -669,37 +669,18 @@ config ZONE_DEVICE If FS_DAX is enabled, then say Y. -config ARCH_HAS_HMM_MIRROR - bool - default y - depends on (X86_64 || PPC64) - depends on MMU && 64BIT - -config ARCH_HAS_HMM - bool - depends on (X86_64 || PPC64) - depends on ZONE_DEVICE - depends on MMU && 64BIT - depends on MEMORY_HOTPLUG - depends on MEMORY_HOTREMOVE - depends on SPARSEMEM_VMEMMAP - default y - config MIGRATE_VMA_HELPER bool config DEV_PAGEMAP_OPS bool -config HMM - bool - select MMU_NOTIFIER - select MIGRATE_VMA_HELPER - config HMM_MIRROR bool "HMM mirror CPU page table into a device page table" - depends on ARCH_HAS_HMM - select HMM + depends on (X86_64 || PPC64) + depends on MMU && 64BIT + select MMU_NOTIFIER + select MIGRATE_VMA_HELPER help Select HMM_MIRROR if you want to mirror range of the CPU page table of a process into a device page table. Here, mirror means "keep synchronized". diff --git a/mm/Makefile b/mm/Makefile index ac5e5ba78874..91c99040065c 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -102,5 +102,5 @@ obj-$(CONFIG_FRAME_VECTOR) += frame_vector.o obj-$(CONFIG_DEBUG_PAGE_REF) += debug_page_ref.o obj-$(CONFIG_HARDENED_USERCOPY) += usercopy.o obj-$(CONFIG_PERCPU_STATS) += percpu-stats.o -obj-$(CONFIG_HMM) += hmm.o +obj-$(CONFIG_HMM_MIRROR) += hmm.o obj-$(CONFIG_MEMFD_CREATE) += memfd.o diff --git a/mm/hmm.c b/mm/hmm.c index 90ca0cdab9db..d62ce64d6bca 100644 --- a/mm/hmm.c +++ b/mm/hmm.c @@ -25,7 +25,6 @@ #include #include -#if IS_ENABLED(CONFIG_HMM_MIRROR) static const struct mmu_notifier_ops hmm_mmu_notifier_ops; static inline struct hmm *mm_get_hmm(struct mm_struct *mm) @@ -1326,4 +1325,3 @@ long hmm_range_dma_unmap(struct hmm_range *range, return cpages; } EXPORT_SYMBOL(hmm_range_dma_unmap); -#endif /* IS_ENABLED(CONFIG_HMM_MIRROR) */ -- 2.20.1 _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm 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=-8.5 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=unavailable 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 8316DC48BD3 for ; Wed, 26 Jun 2019 12:28:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 529322063F for ; Wed, 26 Jun 2019 12:28:47 +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="qeW+utdJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727798AbfFZM2p (ORCPT ); Wed, 26 Jun 2019 08:28:45 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:43156 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727738AbfFZM2f (ORCPT ); Wed, 26 Jun 2019 08:28:35 -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=8c7Qw79j4iTVfYu8BDZ4XSZccS1fj4ydMQxMOZ0rYRM=; b=qeW+utdJvjdhQsheXW/BJJc+6E Je3Qw7KX8yqGRD61b+aMkwDnKhRl79dbPTB2oSJS9EJkkp6B04gH0AKwiMVXmZSWXedEVwmeZuHtd rxfolj9Lb0kntloPPle3ysnemn+eVNPk1PVLI65krTeg8f8ixCclNzvQ1VMgjJNdcaSfpbGEE5JqZ LdQuIQpaH4WpWeh96t9pFdDMHn8Nlh1iBjfjdCn7Tu5xaSa1u8SC412S343cnc/TFWSgHhCX2D4kz T8P1Ggyzn7yKEs00DA9YZRe2O9RSSxL1RnyDktKkewIGQSovonLhKuAUk0FzNPPqOPnS9qC33UPWA glFwMabA==; Received: from clnet-p19-102.ikbnet.co.at ([83.175.77.102] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hg72M-0001fg-QA; Wed, 26 Jun 2019 12:28:31 +0000 From: Christoph Hellwig To: Dan Williams , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jason Gunthorpe , Ben Skeggs Cc: linux-mm@kvack.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-nvdimm@lists.01.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 24/25] mm: remove the HMM config option Date: Wed, 26 Jun 2019 14:27:23 +0200 Message-Id: <20190626122724.13313-25-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190626122724.13313-1-hch@lst.de> References: <20190626122724.13313-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 All the mm/hmm.c code is better keyed off HMM_MIRROR. Also let nouveau depend on it instead of the mix of a dummy dependency symbol plus the actually selected one. Drop various odd dependencies, as the code is pretty portable. Signed-off-by: Christoph Hellwig --- drivers/gpu/drm/nouveau/Kconfig | 3 +-- include/linux/hmm.h | 5 +---- include/linux/mm_types.h | 2 +- mm/Kconfig | 27 ++++----------------------- mm/Makefile | 2 +- mm/hmm.c | 2 -- 6 files changed, 8 insertions(+), 33 deletions(-) diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig index 6303d203ab1d..66c839d8e9d1 100644 --- a/drivers/gpu/drm/nouveau/Kconfig +++ b/drivers/gpu/drm/nouveau/Kconfig @@ -84,11 +84,10 @@ config DRM_NOUVEAU_BACKLIGHT config DRM_NOUVEAU_SVM bool "(EXPERIMENTAL) Enable SVM (Shared Virtual Memory) support" - depends on ARCH_HAS_HMM depends on DEVICE_PRIVATE depends on DRM_NOUVEAU + depends on HMM_MIRROR depends on STAGING - select HMM_MIRROR default n help Say Y here if you want to enable experimental support for diff --git a/include/linux/hmm.h b/include/linux/hmm.h index 3d00e9550e77..b697496e85ba 100644 --- a/include/linux/hmm.h +++ b/include/linux/hmm.h @@ -62,7 +62,7 @@ #include #include -#if IS_ENABLED(CONFIG_HMM) +#ifdef CONFIG_HMM_MIRROR #include #include @@ -332,9 +332,6 @@ static inline uint64_t hmm_pfn_from_pfn(const struct hmm_range *range, return hmm_device_entry_from_pfn(range, pfn); } - - -#if IS_ENABLED(CONFIG_HMM_MIRROR) /* * Mirroring: how to synchronize device page table with CPU page table. * diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index f33a1289c101..8d37182f8dbe 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -501,7 +501,7 @@ struct mm_struct { #endif struct work_struct async_put_work; -#if IS_ENABLED(CONFIG_HMM) +#ifdef CONFIG_HMM_MIRROR /* HMM needs to track a few things per mm */ struct hmm *hmm; #endif diff --git a/mm/Kconfig b/mm/Kconfig index eecf037a54b3..1e426c26b1d6 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -669,37 +669,18 @@ config ZONE_DEVICE If FS_DAX is enabled, then say Y. -config ARCH_HAS_HMM_MIRROR - bool - default y - depends on (X86_64 || PPC64) - depends on MMU && 64BIT - -config ARCH_HAS_HMM - bool - depends on (X86_64 || PPC64) - depends on ZONE_DEVICE - depends on MMU && 64BIT - depends on MEMORY_HOTPLUG - depends on MEMORY_HOTREMOVE - depends on SPARSEMEM_VMEMMAP - default y - config MIGRATE_VMA_HELPER bool config DEV_PAGEMAP_OPS bool -config HMM - bool - select MMU_NOTIFIER - select MIGRATE_VMA_HELPER - config HMM_MIRROR bool "HMM mirror CPU page table into a device page table" - depends on ARCH_HAS_HMM - select HMM + depends on (X86_64 || PPC64) + depends on MMU && 64BIT + select MMU_NOTIFIER + select MIGRATE_VMA_HELPER help Select HMM_MIRROR if you want to mirror range of the CPU page table of a process into a device page table. Here, mirror means "keep synchronized". diff --git a/mm/Makefile b/mm/Makefile index ac5e5ba78874..91c99040065c 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -102,5 +102,5 @@ obj-$(CONFIG_FRAME_VECTOR) += frame_vector.o obj-$(CONFIG_DEBUG_PAGE_REF) += debug_page_ref.o obj-$(CONFIG_HARDENED_USERCOPY) += usercopy.o obj-$(CONFIG_PERCPU_STATS) += percpu-stats.o -obj-$(CONFIG_HMM) += hmm.o +obj-$(CONFIG_HMM_MIRROR) += hmm.o obj-$(CONFIG_MEMFD_CREATE) += memfd.o diff --git a/mm/hmm.c b/mm/hmm.c index 90ca0cdab9db..d62ce64d6bca 100644 --- a/mm/hmm.c +++ b/mm/hmm.c @@ -25,7 +25,6 @@ #include #include -#if IS_ENABLED(CONFIG_HMM_MIRROR) static const struct mmu_notifier_ops hmm_mmu_notifier_ops; static inline struct hmm *mm_get_hmm(struct mm_struct *mm) @@ -1326,4 +1325,3 @@ long hmm_range_dma_unmap(struct hmm_range *range, return cpages; } EXPORT_SYMBOL(hmm_range_dma_unmap); -#endif /* IS_ENABLED(CONFIG_HMM_MIRROR) */ -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: [PATCH 24/25] mm: remove the HMM config option Date: Wed, 26 Jun 2019 14:27:23 +0200 Message-ID: <20190626122724.13313-25-hch@lst.de> References: <20190626122724.13313-1-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190626122724.13313-1-hch-jcswGhMUV9g@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: Dan Williams , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Jason Gunthorpe , Ben Skeggs Cc: linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org, linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org QWxsIHRoZSBtbS9obW0uYyBjb2RlIGlzIGJldHRlciBrZXllZCBvZmYgSE1NX01JUlJPUi4gIEFs c28gbGV0IG5vdXZlYXUKZGVwZW5kIG9uIGl0IGluc3RlYWQgb2YgdGhlIG1peCBvZiBhIGR1bW15 IGRlcGVuZGVuY3kgc3ltYm9sIHBsdXMgdGhlCmFjdHVhbGx5IHNlbGVjdGVkIG9uZS4gIERyb3Ag dmFyaW91cyBvZGQgZGVwZW5kZW5jaWVzLCBhcyB0aGUgY29kZSBpcwpwcmV0dHkgcG9ydGFibGUu CgpTaWduZWQtb2ZmLWJ5OiBDaHJpc3RvcGggSGVsbHdpZyA8aGNoQGxzdC5kZT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vbm91dmVhdS9LY29uZmlnIHwgIDMgKy0tCiBpbmNsdWRlL2xpbnV4L2htbS5o ICAgICAgICAgICAgIHwgIDUgKy0tLS0KIGluY2x1ZGUvbGludXgvbW1fdHlwZXMuaCAgICAgICAg fCAgMiArLQogbW0vS2NvbmZpZyAgICAgICAgICAgICAgICAgICAgICB8IDI3ICsrKystLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQogbW0vTWFrZWZpbGUgICAgICAgICAgICAgICAgICAgICB8ICAyICst CiBtbS9obW0uYyAgICAgICAgICAgICAgICAgICAgICAgIHwgIDIgLS0KIDYgZmlsZXMgY2hhbmdl ZCwgOCBpbnNlcnRpb25zKCspLCAzMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vbm91dmVhdS9LY29uZmlnIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvS2NvbmZp ZwppbmRleCA2MzAzZDIwM2FiMWQuLjY2YzgzOWQ4ZTlkMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL25vdXZlYXUvS2NvbmZpZworKysgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9LY29u ZmlnCkBAIC04NCwxMSArODQsMTAgQEAgY29uZmlnIERSTV9OT1VWRUFVX0JBQ0tMSUdIVAogCiBj b25maWcgRFJNX05PVVZFQVVfU1ZNCiAJYm9vbCAiKEVYUEVSSU1FTlRBTCkgRW5hYmxlIFNWTSAo U2hhcmVkIFZpcnR1YWwgTWVtb3J5KSBzdXBwb3J0IgotCWRlcGVuZHMgb24gQVJDSF9IQVNfSE1N CiAJZGVwZW5kcyBvbiBERVZJQ0VfUFJJVkFURQogCWRlcGVuZHMgb24gRFJNX05PVVZFQVUKKwlk ZXBlbmRzIG9uIEhNTV9NSVJST1IKIAlkZXBlbmRzIG9uIFNUQUdJTkcKLQlzZWxlY3QgSE1NX01J UlJPUgogCWRlZmF1bHQgbgogCWhlbHAKIAkgIFNheSBZIGhlcmUgaWYgeW91IHdhbnQgdG8gZW5h YmxlIGV4cGVyaW1lbnRhbCBzdXBwb3J0IGZvcgpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9o bW0uaCBiL2luY2x1ZGUvbGludXgvaG1tLmgKaW5kZXggM2QwMGU5NTUwZTc3Li5iNjk3NDk2ZTg1 YmEgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbGludXgvaG1tLmgKKysrIGIvaW5jbHVkZS9saW51eC9o bW0uaApAQCAtNjIsNyArNjIsNyBAQAogI2luY2x1ZGUgPGxpbnV4L2tjb25maWcuaD4KICNpbmNs dWRlIDxhc20vcGd0YWJsZS5oPgogCi0jaWYgSVNfRU5BQkxFRChDT05GSUdfSE1NKQorI2lmZGVm IENPTkZJR19ITU1fTUlSUk9SCiAKICNpbmNsdWRlIDxsaW51eC9kZXZpY2UuaD4KICNpbmNsdWRl IDxsaW51eC9taWdyYXRlLmg+CkBAIC0zMzIsOSArMzMyLDYgQEAgc3RhdGljIGlubGluZSB1aW50 NjRfdCBobW1fcGZuX2Zyb21fcGZuKGNvbnN0IHN0cnVjdCBobW1fcmFuZ2UgKnJhbmdlLAogCXJl dHVybiBobW1fZGV2aWNlX2VudHJ5X2Zyb21fcGZuKHJhbmdlLCBwZm4pOwogfQogCi0KLQotI2lm IElTX0VOQUJMRUQoQ09ORklHX0hNTV9NSVJST1IpCiAvKgogICogTWlycm9yaW5nOiBob3cgdG8g c3luY2hyb25pemUgZGV2aWNlIHBhZ2UgdGFibGUgd2l0aCBDUFUgcGFnZSB0YWJsZS4KICAqCmRp ZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L21tX3R5cGVzLmggYi9pbmNsdWRlL2xpbnV4L21tX3R5 cGVzLmgKaW5kZXggZjMzYTEyODljMTAxLi44ZDM3MTgyZjhkYmUgMTAwNjQ0Ci0tLSBhL2luY2x1 ZGUvbGludXgvbW1fdHlwZXMuaAorKysgYi9pbmNsdWRlL2xpbnV4L21tX3R5cGVzLmgKQEAgLTUw MSw3ICs1MDEsNyBAQCBzdHJ1Y3QgbW1fc3RydWN0IHsKICNlbmRpZgogCQlzdHJ1Y3Qgd29ya19z dHJ1Y3QgYXN5bmNfcHV0X3dvcms7CiAKLSNpZiBJU19FTkFCTEVEKENPTkZJR19ITU0pCisjaWZk ZWYgQ09ORklHX0hNTV9NSVJST1IKIAkJLyogSE1NIG5lZWRzIHRvIHRyYWNrIGEgZmV3IHRoaW5n cyBwZXIgbW0gKi8KIAkJc3RydWN0IGhtbSAqaG1tOwogI2VuZGlmCmRpZmYgLS1naXQgYS9tbS9L Y29uZmlnIGIvbW0vS2NvbmZpZwppbmRleCBlZWNmMDM3YTU0YjMuLjFlNDI2YzI2YjFkNiAxMDA2 NDQKLS0tIGEvbW0vS2NvbmZpZworKysgYi9tbS9LY29uZmlnCkBAIC02NjksMzcgKzY2OSwxOCBA QCBjb25maWcgWk9ORV9ERVZJQ0UKIAogCSAgSWYgRlNfREFYIGlzIGVuYWJsZWQsIHRoZW4gc2F5 IFkuCiAKLWNvbmZpZyBBUkNIX0hBU19ITU1fTUlSUk9SCi0JYm9vbAotCWRlZmF1bHQgeQotCWRl cGVuZHMgb24gKFg4Nl82NCB8fCBQUEM2NCkKLQlkZXBlbmRzIG9uIE1NVSAmJiA2NEJJVAotCi1j b25maWcgQVJDSF9IQVNfSE1NCi0JYm9vbAotCWRlcGVuZHMgb24gKFg4Nl82NCB8fCBQUEM2NCkK LQlkZXBlbmRzIG9uIFpPTkVfREVWSUNFCi0JZGVwZW5kcyBvbiBNTVUgJiYgNjRCSVQKLQlkZXBl bmRzIG9uIE1FTU9SWV9IT1RQTFVHCi0JZGVwZW5kcyBvbiBNRU1PUllfSE9UUkVNT1ZFCi0JZGVw ZW5kcyBvbiBTUEFSU0VNRU1fVk1FTU1BUAotCWRlZmF1bHQgeQotCiBjb25maWcgTUlHUkFURV9W TUFfSEVMUEVSCiAJYm9vbAogCiBjb25maWcgREVWX1BBR0VNQVBfT1BTCiAJYm9vbAogCi1jb25m aWcgSE1NCi0JYm9vbAotCXNlbGVjdCBNTVVfTk9USUZJRVIKLQlzZWxlY3QgTUlHUkFURV9WTUFf SEVMUEVSCi0KIGNvbmZpZyBITU1fTUlSUk9SCiAJYm9vbCAiSE1NIG1pcnJvciBDUFUgcGFnZSB0 YWJsZSBpbnRvIGEgZGV2aWNlIHBhZ2UgdGFibGUiCi0JZGVwZW5kcyBvbiBBUkNIX0hBU19ITU0K LQlzZWxlY3QgSE1NCisJZGVwZW5kcyBvbiAoWDg2XzY0IHx8IFBQQzY0KQorCWRlcGVuZHMgb24g TU1VICYmIDY0QklUCisJc2VsZWN0IE1NVV9OT1RJRklFUgorCXNlbGVjdCBNSUdSQVRFX1ZNQV9I RUxQRVIKIAloZWxwCiAJICBTZWxlY3QgSE1NX01JUlJPUiBpZiB5b3Ugd2FudCB0byBtaXJyb3Ig cmFuZ2Ugb2YgdGhlIENQVSBwYWdlIHRhYmxlIG9mIGEKIAkgIHByb2Nlc3MgaW50byBhIGRldmlj ZSBwYWdlIHRhYmxlLiBIZXJlLCBtaXJyb3IgbWVhbnMgImtlZXAgc3luY2hyb25pemVkIi4KZGlm ZiAtLWdpdCBhL21tL01ha2VmaWxlIGIvbW0vTWFrZWZpbGUKaW5kZXggYWM1ZTViYTc4ODc0Li45 MWM5OTA0MDA2NWMgMTAwNjQ0Ci0tLSBhL21tL01ha2VmaWxlCisrKyBiL21tL01ha2VmaWxlCkBA IC0xMDIsNSArMTAyLDUgQEAgb2JqLSQoQ09ORklHX0ZSQU1FX1ZFQ1RPUikgKz0gZnJhbWVfdmVj dG9yLm8KIG9iai0kKENPTkZJR19ERUJVR19QQUdFX1JFRikgKz0gZGVidWdfcGFnZV9yZWYubwog b2JqLSQoQ09ORklHX0hBUkRFTkVEX1VTRVJDT1BZKSArPSB1c2VyY29weS5vCiBvYmotJChDT05G SUdfUEVSQ1BVX1NUQVRTKSArPSBwZXJjcHUtc3RhdHMubwotb2JqLSQoQ09ORklHX0hNTSkgKz0g aG1tLm8KK29iai0kKENPTkZJR19ITU1fTUlSUk9SKSArPSBobW0ubwogb2JqLSQoQ09ORklHX01F TUZEX0NSRUFURSkgKz0gbWVtZmQubwpkaWZmIC0tZ2l0IGEvbW0vaG1tLmMgYi9tbS9obW0uYwpp bmRleCA5MGNhMGNkYWI5ZGIuLmQ2MmNlNjRkNmJjYSAxMDA2NDQKLS0tIGEvbW0vaG1tLmMKKysr IGIvbW0vaG1tLmMKQEAgLTI1LDcgKzI1LDYgQEAKICNpbmNsdWRlIDxsaW51eC9tbXVfbm90aWZp ZXIuaD4KICNpbmNsdWRlIDxsaW51eC9tZW1vcnlfaG90cGx1Zy5oPgogCi0jaWYgSVNfRU5BQkxF RChDT05GSUdfSE1NX01JUlJPUikKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgbW11X25vdGlmaWVyX29w cyBobW1fbW11X25vdGlmaWVyX29wczsKIAogc3RhdGljIGlubGluZSBzdHJ1Y3QgaG1tICptbV9n ZXRfaG1tKHN0cnVjdCBtbV9zdHJ1Y3QgKm1tKQpAQCAtMTMyNiw0ICsxMzI1LDMgQEAgbG9uZyBo bW1fcmFuZ2VfZG1hX3VubWFwKHN0cnVjdCBobW1fcmFuZ2UgKnJhbmdlLAogCXJldHVybiBjcGFn ZXM7CiB9CiBFWFBPUlRfU1lNQk9MKGhtbV9yYW5nZV9kbWFfdW5tYXApOwotI2VuZGlmIC8qIElT X0VOQUJMRUQoQ09ORklHX0hNTV9NSVJST1IpICovCi0tIAoyLjIwLjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCk5vdXZlYXUgbWFpbGluZyBsaXN0Ck5v dXZlYXVAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vbm91dmVhdQ==