multiple definition of `show_mem'

[Marc Kleine-Budde]

Hello,

current mainline (v2.6.38-7210-gb81a618) on ARM/mxs has the following build failure:

> lib/lib.a(show_mem.o): In function `show_mem':
> .../linux-2.6/lib/show_mem.c:67: multiple definition of `show_mem'
> arch/arm/mm/built-in.o:.../linux-2.6/arch/arm/mm/init.c:82: first defined here
> make: *** [vmlinux.o] Error 1

After reverting these patches the kernel compiles...

cbf978bfb12d7deca97d7333f65eda0381a072de oom: suppress nodes that are not allowed from meminfo on page alloc failure
29423e77c06cee7d4e335ef4a7cbd949da978c91 oom: suppress show_mem() for many nodes in irq context on page alloc failure
ddd588b5dd55f14320379961e47683db4e4c1d90 oom: suppress nodes that are not allowed from meminfo on oom kill

No time to boot the kernel, though.

cheers, MArc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |

Attachment: signature.asc
Description: OpenPGP digital signature