linux-next: build failure after merge of the memblock tree

linux-next: build failure after merge of the memblock tree

[Stephen Rothwell]

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

Hi Tejun,

After merging the memblock tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

arch/powerpc/mm/numa.c: In function 'get_node_active_region':
arch/powerpc/mm/numa.c:143:11: error: dereferencing pointer to incomplete type
arch/powerpc/mm/numa.c:144:11: error: dereferencing pointer to incomplete type
arch/powerpc/mm/numa.c:145:11: error: dereferencing pointer to incomplete type
arch/powerpc/mm/numa.c: In function 'mark_reserved_regions_for_nid':
arch/powerpc/mm/numa.c:960:29: error: storage size of 'node_ar' isn't known
arch/powerpc/mm/numa.c:960:29: error: unused variable 'node_ar' [-Werror=unused-variable]
cc1: all warnings being treated as errors

Caused by commit 9d0d131f9f6d ("memblock: Kill early_node_map[]") which
seems to have misspelled CONFIG_HAVE_MEMBLOCK_NODE_MAP as
CONFIG_MEMBLOCK_HAVE_NODE_MAP in include/linux/mmzone.h.

I have dropped the memblock tree for today - we can try again tomorrow.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

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

Hi Tejun,

On Tue, 6 Dec 2011 14:38:08 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the memblock tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> arch/powerpc/mm/numa.c: In function 'get_node_active_region':
> arch/powerpc/mm/numa.c:143:11: error: dereferencing pointer to incomplete type
> arch/powerpc/mm/numa.c:144:11: error: dereferencing pointer to incomplete type
> arch/powerpc/mm/numa.c:145:11: error: dereferencing pointer to incomplete type
> arch/powerpc/mm/numa.c: In function 'mark_reserved_regions_for_nid':
> arch/powerpc/mm/numa.c:960:29: error: storage size of 'node_ar' isn't known
> arch/powerpc/mm/numa.c:960:29: error: unused variable 'node_ar' [-Werror=unused-variable]
> cc1: all warnings being treated as errors
> 
> Caused by commit 9d0d131f9f6d ("memblock: Kill early_node_map[]") which
> seems to have misspelled CONFIG_HAVE_MEMBLOCK_NODE_MAP as
> CONFIG_MEMBLOCK_HAVE_NODE_MAP in include/linux/mmzone.h.
> 
> I have dropped the memblock tree for today - we can try again tomorrow.

Ping?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Tejun Heo]

Hello,

On Wed, Dec 7, 2011 at 12:54 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Caused by commit 9d0d131f9f6d ("memblock: Kill early_node_map[]") which
>> seems to have misspelled CONFIG_HAVE_MEMBLOCK_NODE_MAP as
>> CONFIG_MEMBLOCK_HAVE_NODE_MAP in include/linux/mmzone.h.
>>
>> I have dropped the memblock tree for today - we can try again tomorrow.
>
> Ping?

Still trying to restore my cross build setup. I think I will be able
to send update series later today.

Thanks.

-- 
tejun

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

[Tejun Heo]

Hello,

On Wed, Dec 07, 2011 at 01:30:44PM -0800, Tejun Heo wrote:
> Still trying to restore my cross build setup. I think I will be able
> to send update series later today.

Made the following changes,

* Fix the CONFIG_HAVE typo bug.

* Remove 7 space -> tab conversion in arch/score/Kconfig to ease
  conflict resolution.

* Merge resolution in arch/arm/mm/init.c was incorrect.  Both sort()
  and memblock_init() calls should be removed.  Fixed.

memblock-kill-early_node_map is now 7bd0b0f0da.

  git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git memblock-kill-early_node_map

Merge result can be verified against the following branch (d8b950f4c3)

  git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git memblock-kill-early_node_map-next

Thanks.

-- 
tejun