The patch titled Subject: arch/sparc/mm/srmmu.c: fix build has been added to the -mm tree. Its filename is arch-sparc-mm-srmmuc-fix-build.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/arch-sparc-mm-srmmuc-fix-build.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/arch-sparc-mm-srmmuc-fix-build.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 <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: arch/sparc/mm/srmmu.c: fix build "mm: consolidate pte_index() and pte_offset_*() definitions" was supposed to remove arch/sparc/mm/srmmu.c:pte_offset_kernel(). Reported-by: kernel test robot <lkp@xxxxxxxxx> Cc: Mike Rapoport <rppt@xxxxxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/sparc/mm/srmmu.c | 10 ---------- 1 file changed, 10 deletions(-) --- a/arch/sparc/mm/srmmu.c~arch-sparc-mm-srmmuc-fix-build +++ a/arch/sparc/mm/srmmu.c @@ -140,16 +140,6 @@ void pmd_set(pmd_t *pmdp, pte_t *ptep) set_pte((pte_t *)&pmd_val(*pmdp), __pte(SRMMU_ET_PTD | ptp)); } -/* Find an entry in the third-level page table.. */ -pte_t *pte_offset_kernel(pmd_t *dir, unsigned long address) -{ - void *pte; - - pte = __nocache_va((pmd_val(*dir) & SRMMU_PTD_PMASK) << 4); - return (pte_t *) pte + - ((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)); -} - /* * size: bytes to allocate in the nocache area. * align: bytes, number to align at. _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are arch-sparc-mm-srmmuc-fix-build.patch bpf-bpf_seq_printf-handle-potentially-unsafe-format-string-better.patch drivers-tty-serial-sh-scic-suppress-uninitialized-var-warning.patch mm.patch lib-test-get_count_order-long-in-test_bitopsc-fix.patch lib-test-get_count_order-long-in-test_bitopsc-fix-fix.patch ipc-convert-ipcs_idr-to-xarray-update-fix.patch linux-next-rejects.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 kernel-forkc-export-kernel_thread-to-modules.patch