From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: + arch-kunmap-remove-duplicate-kunmap-implementations-fix.patch added to -mm tree Date: Thu, 07 May 2020 19:08:13 -0700 Message-ID: <20200508020813.KT6Udx4zG%akpm@linux-foundation.org> References: <20200507183509.c5ef146c5aaeb118a25a39a8@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail.kernel.org ([198.145.29.99]:42008 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726538AbgEHCIO (ORCPT ); Thu, 7 May 2020 22:08:14 -0400 In-Reply-To: <20200507183509.c5ef146c5aaeb118a25a39a8@linux-foundation.org> Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: akpm@linux-foundation.org, ira.weiny@intel.com, mm-commits@vger.kernel.org, sfr@canb.auug.org.au The patch titled Subject: arch-kunmap-remove-duplicate-kunmap-implementations-fix has been added to the -mm tree. Its filename is arch-kunmap-remove-duplicate-kunmap-implementations-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/arch-kunmap-remove-duplicate-kunmap-implementations-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/arch-kunmap-remove-duplicate-kunmap-implementations-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton Subject: arch-kunmap-remove-duplicate-kunmap-implementations-fix fix CONFIG_HIGHMEM=n build on various architectures Reported-by: Stephen Rothwell Cc: Ira Weiny Signed-off-by: Andrew Morton --- include/linux/highmem.h | 5 +++++ 1 file changed, 5 insertions(+) --- a/include/linux/highmem.h~arch-kunmap-remove-duplicate-kunmap-implementations-fix +++ a/include/linux/highmem.h @@ -53,6 +53,7 @@ static inline void *kmap(struct page *pa } void kunmap_high(struct page *page); + static inline void kunmap(struct page *page) { might_sleep(); @@ -111,6 +112,10 @@ static inline void *kmap(struct page *pa return page_address(page); } +static inline void kunmap_high(struct page *page) +{ +} + static inline void kunmap(struct page *page) { } _ Patches currently in -mm which might be from akpm@linux-foundation.org are squashfs-migrate-from-ll_rw_block-usage-to-bio-fix.patch drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch mm.patch mm-slub-fix-corrupted-freechain-in-deactivate_slab-fix.patch mm-slub-add-panic_on_error-to-the-debug-facilities-fix.patch mm-gupc-updating-the-documentation-fix.patch mm-swapfilec-classify-swap_map_xxx-to-make-it-more-readable-fix.patch mm-remove-__vmalloc_node_flags_caller-fix.patch mm-switch-the-test_vmalloc-module-to-use-__vmalloc_node-fix.patch mm-switch-the-test_vmalloc-module-to-use-__vmalloc_node-fix-fix.patch mm-remove-vmalloc_user_node_flags-fix.patch arch-kunmap-remove-duplicate-kunmap-implementations-fix.patch arch-kmap_atomic-consolidate-duplicate-code-checkpatch-fixes.patch arch-kunmap_atomic-consolidate-duplicate-code-checkpatch-fixes.patch kmap-consolidate-kmap_prot-definitions-checkpatch-fixes.patch mm-add-debug_wx-support-fixpatch-added-to-mm-tree.patch riscv-support-debug_wx-fix.patch mm-replace-zero-length-array-with-flexible-array-member-fix.patch mm-hugetlb-fix-a-typo-in-comment-manitained-maintained-v2-checkpatch-fixes.patch linux-next-rejects.patch linux-next-git-rejects.patch arch-x86-makefile-use-config_shell.patch kernel-forkc-export-kernel_thread-to-modules.patch