Re: linux-next: build failure after merge of the akpm-current tree

Stephen Rothwell
2020-06-10T10:15:07Z

[-- Attachment #1: Type: text/plain, Size: 1448 bytes --]

Hi Andrew,

On Tue, 9 Jun 2020 21:01:37 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> I've sent this in as well:
>
> From: Andrew Morton <akpm@linux-foundation.org>
> 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().
>
> Fixes: 974b9b2c68f3d35 ("mm: consolidate pte_index() and pte_offset_*() definitions")
> Reported-by: kernel test robot <lkp@intel.com>
> Cc: Mike Rapoport <rppt@linux.ibm.com>
> Cc: Johannes Weiner <hannes@cmpxchg.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
>
> 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.
> _
>

Thanks.

--
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]