lkml.org 
[lkml]   [2013]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the akpm tree with the sparc-next tree
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++;
- }
}
}

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-03-21 07:01    [W:0.035 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site