lib, arch: add filter argument to show_mem and fix private implementations
David Rientjes authored
Commit ddd588b5

 ("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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Reported-by: default avatarJames Bottomley <James.Bottomley@hansenpartnership.com>
Suggested-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
b2b755b5
Name Last commit Last update
..
accessibility drop explicit include of autoconf.h
acpi Merge branch 'sysdev' into release
amba ARM: 6758/1: amba: support pm ops
ata Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
atm Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
auxdisplay auxdisplay: section cleanup in cfag12864bfb driver
base Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
block Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block
bluetooth Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
cdrom gdrom,viocd: Convert to bdops->check_events()
char drivers/char/mem.c: clean up the code
clk ARM: 6483/1: arm & sh: factorised duplicated clkdev.c
clocksource drivers/clocksource/tcb_clksrc.c: fix init sequence
connector connector: Convert char *name to const char *name
cpufreq [CPUFREQ] Remove the pm_message_t argument from driver suspend
cpuidle Merge branch 'master' into for-next
crypto Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
dca drivers/dca/dca-core.c: use list_move() instead of list_del()/list_add() combination
dio m68k: don't export static inline functions
dma mfd: mfd_cell is now implicitly available to timberdale drivers
edac Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
eisa eisa: fix coding style for eisa bus code
firewire Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
firmware sigma-firmware: loader for Analog Devices' SigmaStudio
gpio gpio: Add Tunnel Creek support to sch_gpio
gpu
hid
hwmon
hwspinlock
i2c
ide
idle
ieee802154
infiniband
input
isdn
leds
lguest
macintosh
mca
md
media
memstick
message
mfd
misc
mmc
mtd
net
nfc
nubus
of
oprofile
parisc
parport
pci
pcmcia
platform
pnp
power
pps
ps3
rapidio
regulator
rtc
s390
sbus
scsi
sfi
sh
sn
spi
ssb
staging
target
tc
telephony
thermal
tty
uio
usb
uwb
vhost
video
virtio
vlynq
w1
watchdog
xen
zorro
Kconfig
Makefile