davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
b2b755b5f1
kernel-ark/drivers
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
..
accessibility
acpi Merge branch 'sysdev' into release 2011-03-23 02:35:02 -04:00
amba
ata
atm
auxdisplay
base
block Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block 2011-03-24 10:16:26 -07:00
bluetooth
cdrom
char drivers/char/mem.c: clean up the code 2011-03-23 19:46:40 -07:00
clk
clocksource
connector
cpufreq
cpuidle
crypto
dca drivers/dca/dca-core.c: use list_move() instead of list_del()/list_add() combination 2011-03-22 17:44:12 -07:00
dio
dma mfd: mfd_cell is now implicitly available to timberdale drivers 2011-03-23 10:41:52 +01:00
edac
eisa
firewire
firmware sigma-firmware: loader for Analog Devices' SigmaStudio 2011-03-22 17:44:15 -07:00
gpio gpio: Add Tunnel Creek support to sch_gpio 2011-03-23 10:42:08 +01:00
gpu Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 2011-03-24 17:27:20 -07:00
hid backlight: add backlight type 2011-03-22 17:43:59 -07:00
hwmon jz4740: silence warnings related to mfd_get_cell changes 2011-03-23 10:42:02 +01:00
hwspinlock
i2c mfd: mfd_cell is now implicitly available to timberdale drivers 2011-03-23 10:41:52 +01:00
ide Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block 2011-03-24 10:16:26 -07:00
idle
ieee802154
infiniband Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 2011-03-24 07:59:46 -07:00
input mfd: Adopt mfd_data in 88pm860x input driver 2011-03-23 10:42:06 +01:00
isdn
leds mfd: Adopt mfd_data in 88pm860x led 2011-03-23 10:42:06 +01:00
lguest
macintosh backlight: add backlight type 2011-03-22 17:43:59 -07:00
mca
md Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block 2011-03-24 10:16:26 -07:00
media Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
memstick
message Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block 2011-03-24 10:16:26 -07:00
mfd Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
misc drivers/misc/pch_phub.c: add MODULE_DEVICE_TABLE 2011-03-22 17:44:11 -07:00
mmc Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block 2011-03-24 10:16:26 -07:00
mtd Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6 2011-03-24 08:22:34 -07:00
net Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 2011-03-24 07:59:46 -07:00
nfc
nubus
of of/flattree: minor cleanups 2011-03-23 14:55:56 -06:00
oprofile
parisc
parport
pci 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
pcmcia
platform backlight: add backlight type 2011-03-22 17:43:59 -07:00
pnp pnp: only assign IORESOURCE_DMA if CONFIG_ISA_DMA_API is enabled 2011-03-22 17:44:16 -07:00
power jz4740: silence warnings related to mfd_get_cell changes 2011-03-23 10:42:02 +01:00
pps pps: remove unreachable code 2011-03-22 17:44:17 -07:00
ps3
rapidio rapidio: fix potential null deref on failure path 2011-03-23 19:46:44 -07:00
regulator regulator: Add a subdriver for TI TPS6105x regulator portions v2 2011-03-23 10:42:09 +01:00
rtc rtc: add real-time clock driver for NVIDIA Tegra 2011-03-22 17:44:16 -07:00
s390 Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block 2011-03-24 10:16:26 -07:00
sbus
scsi Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block 2011-03-24 10:16:26 -07:00
sfi
sh sh: Use struct syscore_ops instead of sysdevs 2011-03-23 18:57:37 +09:00
sn
spi Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 2011-03-24 09:30:20 -07:00
ssb
staging Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block 2011-03-24 10:16:26 -07:00
target Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block 2011-03-24 10:16:26 -07:00
tc
telephony
thermal
tty lib, arch: add filter argument to show_mem and fix private implementations 2011-03-24 17:49:37 -07:00
uio
usb Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-03-24 10:02:55 -07:00
uwb
vhost
video Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
virtio
vlynq
w1 w1: Silence ds1wm warnings related to mfd_get_cell changes 2011-03-23 10:42:02 +01:00
watchdog rdc321x-southbridge: Use mfd_data instead of driver_data 2011-03-23 10:41:57 +01:00
xen
zorro
Kconfig
Makefile