1
0
Fork 0
alistair23-linux/arch
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
..
alpha remove dma64_addr_t 2011-03-23 19:47:18 -07:00
arm lib, arch: add filter argument to show_mem and fix private implementations 2011-03-24 17:49:37 -07:00
avr32 bitops: remove minix bitops from asm/bitops.h 2011-03-23 19:46:22 -07:00
blackfin Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin 2011-03-24 08:24:28 -07:00
cris remove dma64_addr_t 2011-03-23 19:47:18 -07:00
frv bitops: remove minix bitops from asm/bitops.h 2011-03-23 19:46:22 -07:00
h8300 bitops: remove minix bitops from asm/bitops.h 2011-03-23 19:46:22 -07:00
ia64 lib, arch: add filter argument to show_mem and fix private implementations 2011-03-24 17:49:37 -07:00
m32r remove dma64_addr_t 2011-03-23 19:47:18 -07:00
m68k remove dma64_addr_t 2011-03-23 19:47:18 -07:00
m68knommu m68knommu: introduce little-endian bitops 2011-03-23 19:46:14 -07:00
microblaze bitops: introduce CONFIG_GENERIC_FIND_BIT_LE 2011-03-23 19:46:14 -07:00
mips remove dma64_addr_t 2011-03-23 19:47:18 -07:00
mn10300 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300 2011-03-24 10:07:50 -07:00
parisc lib, arch: add filter argument to show_mem and fix private implementations 2011-03-24 17:49:37 -07:00
powerpc lib, arch: add filter argument to show_mem and fix private implementations 2011-03-24 17:49:37 -07:00
s390 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
score mm: NUMA aware alloc_thread_info_node() 2011-03-22 17:44:01 -07:00
sh Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 2011-03-24 10:04:59 -07:00
sparc lib, arch: add filter argument to show_mem and fix private implementations 2011-03-24 17:49:37 -07:00
tile lib, arch: add filter argument to show_mem and fix private implementations 2011-03-24 17:49:37 -07:00
um um: remove file pointer from ioctl 2011-03-22 17:44:09 -07:00
unicore32 lib, arch: add filter argument to show_mem and fix private implementations 2011-03-24 17:49:37 -07:00
x86 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2011-03-24 08:25:15 -07:00
xtensa bitops: remove minix bitops from asm/bitops.h 2011-03-23 19:46:22 -07:00
.gitignore
Kconfig oprofile, s390: Cleanups 2011-03-16 14:30:40 +01:00