* linux-next: manual merge of the akpm tree with the sparc-next tree
@ 2013-03-21 5:33 Stephen Rothwell
2013-03-21 20:21 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2013-03-21 5:33 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Jiang Liu, Tkhai Kirill, David Miller
[-- Attachment #1: Type: text/plain, Size: 1033 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
arch/sparc/mm/init_64.c between commit ce835e513a93 ("sparc64: Do not
change num_physpages during initmem freeing") from the sparc-next tree
and commit "mm/SPARC: use common help functions to free reserved pages"
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@canb.auug.org.au
diff --cc arch/sparc/mm/init_64.c
index 076068f,3f559d1..0000000
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@@ -2119,14 -2117,10 +2117,8 @@@ void free_initmem(void
((unsigned long) KERNBASE));
memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
-- if (do_free) {
- p = virt_to_page(page);
-
- ClearPageReserved(p);
- init_page_count(p);
- __free_page(p);
- totalram_pages++;
- }
++ if (do_free)
+ free_reserved_page(virt_to_page(page));
- num_physpages++;
- }
}
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the sparc-next tree
2013-03-21 5:33 linux-next: manual merge of the akpm tree with the sparc-next tree Stephen Rothwell
@ 2013-03-21 20:21 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2013-03-21 20:21 UTC (permalink / raw)
To: sfr; +Cc: akpm, linux-next, linux-kernel, liuj97, tkhai
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 21 Mar 2013 16:33:28 +1100
> Today's linux-next merge of the akpm tree got a conflict in
> arch/sparc/mm/init_64.c between commit ce835e513a93 ("sparc64: Do not
> change num_physpages during initmem freeing") from the sparc-next tree
> and commit "mm/SPARC: use common help functions to free reserved pages"
> from the akpm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
This was expected, and the merge resolution looks fine to me,
thanks Stephen!
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the sparc-next tree
2013-11-15 5:00 ` Stephen Rothwell
@ 2013-11-15 5:24 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2013-11-15 5:24 UTC (permalink / raw)
To: sfr; +Cc: akpm, linux-next, linux-kernel
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 15 Nov 2013 16:00:00 +1100
> [Forgot to cc Dave]
Yes, I told Linus about this conflict when I sent in my sparc pull
request this afternoon.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the sparc-next tree
2013-11-15 4:57 Stephen Rothwell
@ 2013-11-15 5:00 ` Stephen Rothwell
2013-11-15 5:24 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2013-11-15 5:00 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, David S. Miller
[-- Attachment #1: Type: text/plain, Size: 1558 bytes --]
[Forgot to cc Dave]
On Fri, 15 Nov 2013 15:57:33 +1100 Stephen Rothwell <sfr@canb.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@canb.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)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the akpm tree with the sparc-next tree
@ 2013-11-15 4:57 Stephen Rothwell
2013-11-15 5:00 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2013-11-15 4:57 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1353 bytes --]
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@canb.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)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-11-15 5:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-21 5:33 linux-next: manual merge of the akpm tree with the sparc-next tree Stephen Rothwell
2013-03-21 20:21 ` David Miller
2013-11-15 4:57 Stephen Rothwell
2013-11-15 5:00 ` Stephen Rothwell
2013-11-15 5:24 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).