kevin/linux
1
Fork 0
Code
62d0086751
linux/arch/powerpc
History
David Rientjes b2b755b5f1 lib, arch: add filter argument to show_mem and fix private implementations 
Commit ddd588b5dd ("oom: suppress nodes that are not allowed from
meminfo on oom kill") moved lib/show_mem.o out of lib/lib.a, which
resulted in build warnings on all architectures that implement their own
versions of show_mem():

	lib/lib.a(show_mem.o): In function `show_mem':
	show_mem.c:(.text+0x1f4): multiple definition of `show_mem'
	arch/sparc/mm/built-in.o:(.text+0xd70): first defined here

The fix is to remove __show_mem() and add its argument to show_mem() in
all implementations to prevent this breakage.

Architectures that implement their own show_mem() actually don't do
anything with the argument yet, but they could be made to filter nodes
that aren't allowed in the current context in the future just like the
generic implementation.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: James Bottomley <James.Bottomley@hansenpartnership.com>
Suggested-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-03-24 17:49:37 -07:00
..
boot Merge remote branch 'jwb/next' into next 2011-03-17 17:59:01 +11:00
configs powerpc/8xx: remove obsolete mgsuvd board 2011-03-15 10:11:27 -05:00
include/asm remove dma64_addr_t 2011-03-23 19:47:18 -07:00
kernel Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 2011-03-23 20:51:42 -07:00
kvm KVM: PPC: Fix SPRG get/set for Book3S and BookE 2011-03-17 13:08:25 -03:00
lib powerpc: Ensure the else case of feature sections will fit 2011-01-21 14:08:33 +11:00
math-emu powerpc/85xx: Fix SPE float to integer conversion failure 2011-03-15 13:48:15 -05:00
mm Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2011-03-18 06:31:43 -07:00
oprofile tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
platforms Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2011-03-18 06:31:43 -07:00
sysdev rapidio: remove mport resource reservation from common RIO code 2011-03-23 19:46:43 -07:00
xmon lib, arch: add filter argument to show_mem and fix private implementations 2011-03-24 17:49:37 -07:00
Kconfig rapidio: modify configuration to support PCI-SRIO controller 2011-03-23 19:46:42 -07:00
Kconfig.debug powerpc: Unconditionally enabled irq stacks 2010-06-15 15:02:37 +10:00
Makefile powerpc: Fix typo in uImage target 2010-08-24 15:26:32 +10:00
relocs_check.pl