linux-kernel - Re: linux-next: manual merge of the akpm tree with the sparc-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20131115160000.dffe5b8a2db3ca60c5c01e55@canb.auug.org.au>
Date:	Fri, 15 Nov 2013 16:00:00 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"David S. Miller" <davem@...emloft.net>
Subject: Re: linux-next: manual merge of the akpm tree with the sparc-next
 tree

[Forgot to cc Dave]

On Fri, 15 Nov 2013 15:57:33 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Hi Andrew,
> 
> Today's linux-next merge of the akpm tree got a conflict in
> arch/sparc/mm/init_64.c between commit 37b3a8ff3e08 ("sparc64: Move from
> 4MB to 8MB huge pages") from the sparc-next tree and commit "sparc:
> handle pgtable_page_ctor() fail" from the akpm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
> 
> diff --cc arch/sparc/mm/init_64.c
> index bd6430ded69f,d6de9353ee11..000000000000
> --- a/arch/sparc/mm/init_64.c
> +++ b/arch/sparc/mm/init_64.c
> @@@ -2563,16 -2511,21 +2563,16 @@@ pte_t *pte_alloc_one_kernel(struct mm_s
>   pgtable_t pte_alloc_one(struct mm_struct *mm,
>   			unsigned long address)
>   {
>  -	struct page *page;
>  -	pte_t *pte;
>  -
>  -	pte = get_from_cache(mm);
>  -	if (pte)
>  -		return pte;
>  +	struct page *page = alloc_page(GFP_KERNEL | __GFP_NOTRACK |
>  +				       __GFP_REPEAT | __GFP_ZERO);
> - 	pte_t *pte = NULL;
>   
> - 	if (page) {
> - 		pgtable_page_ctor(page);
> - 		pte = (pte_t *) page_address(page);
>  -	page = __alloc_for_cache(mm);
> + 	if (!page)
> + 		return NULL;
> + 	if (!pgtable_page_ctor(page)) {
> + 		free_hot_cold_page(page, 0);
> + 		return NULL;
>   	}
> - 
> - 	return pte;
> + 	return (pte_t *) page_address(page);
>   }
>   
>   void pte_free_kernel(struct mm_struct *mm, pte_t *pte)

Content of type "application/pgp-signature" skipped