lkml.org 
[lkml]   [2011]   [Dec]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the memblock tree with the arm tree
Hi Tejun,

[Tejun, I know you told me about these, but I am reporting them anyway
just for completeness.]

Today's linux-next merge of the memblock tree got a conflict in
arch/arm/mm/init.c between commit 27a3f0e91bed ("ARM: sort the meminfo
array earlier") from the arm tree and commit 0dac7e2d90aa ("memblock:
Kill memblock_init()") from the memblock tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc arch/arm/mm/init.c
index 786addd,7c38474..0000000
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@@ -310,7 -331,8 +311,6 @@@ void __init arm_memblock_init(struct me
{
int i;

- memblock_init();
- sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), meminfo_cmp, NULL);
-
for (i = 0; i < mi->nr_banks; i++)
memblock_add(mi->bank[i].start, mi->bank[i].size);

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2011-12-06 04:21    [W:0.068 / U:0.468 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site