The patch titled Subject: arch-kunmap-remove-duplicate-kunmap-implementations-fix has been removed from the -mm tree. Its filename was arch-kunmap-remove-duplicate-kunmap-implementations-fix.patch This patch was dropped because it was folded into arch-kunmap-remove-duplicate-kunmap-implementations.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: arch-kunmap-remove-duplicate-kunmap-implementations-fix fix CONFIG_HIGHMEM=n build on various architectures Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Cc: Ira Weiny <ira.weiny@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- 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@xxxxxxxxxxxxxxxxxxxx are arch-kunmap-remove-duplicate-kunmap-implementations.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-replace-zero-length-array-with-flexible-array-member-fix.patch mm-hugetlb-fix-a-typo-in-comment-manitained-maintained-v2-checkpatch-fixes.patch lib-test-get_count_order-long-in-test_bitopsc-fix.patch seq_file-introduce-define_seq_attribute-helper-macro-checkpatch-fixes.patch drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch mm.patch ipc-convert-ipcs_idr-to-xarray-update-fix.patch linux-next-pre.patch linux-next-rejects.patch linux-next-post.patch kernel-add-panic_on_taint-fix.patch mm-consolidate-pgd_index-and-pgd_offset_k-definitions-fix.patch mmap-locking-api-convert-mmap_sem-call-sites-missed-by-coccinelle-fix.patch mmap-locking-api-convert-mmap_sem-call-sites-missed-by-coccinelle-fix-fix.patch mmap-locking-api-convert-mmap_sem-call-sites-missed-by-coccinelle-fix-fix-fix.patch mmap-locking-api-rename-mmap_sem-to-mmap_lock-fix.patch mmap-locking-api-convert-mmap_sem-comments-fix.patch mmap-locking-api-convert-mmap_sem-comments-fix-fix.patch mmap-locking-api-convert-mmap_sem-comments-fix-fix-fix.patch mm-pass-task-and-mm-to-do_madvise.patch mm-introduce-external-memory-hinting-api-fix-2-fix.patch mm-support-vector-address-ranges-for-process_madvise-fix-fix-fix-fix-fix.patch maccess-unify-the-probe-kernel-arch-hooks-fix.patch bpf-bpf_seq_printf-handle-potentially-unsafe-format-string-better.patch maccess-always-use-strict-semantics-for-probe_kernel_read-fix.patch x86-use-non-set_fs-based-maccess-routines-checkpatch-fixes.patch doc-cgroup-update-note-about-conditions-when-oom-killer-is-invoked-fix.patch sh-convert-ins-outs-macros-to-inline-functions-checkpatch-fixes.patch kernel-forkc-export-kernel_thread-to-modules.patch