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
..
acpi	Merge branch 'linus' into release	2011-03-23 02:34:54 -04:00
asm-generic	bitops: remove minix bitops from asm/bitops.h	2011-03-23 19:46:22 -07:00
crypto
drm	drm/vblank: update recently added vbl interface to be more future proof.	2011-03-24 21:28:46 +10:00
keys
linux	lib, arch: add filter argument to show_mem and fix private implementations	2011-03-24 17:49:37 -07:00
math-emu
media	[media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t	2011-03-22 19:41:58 -03:00
mtd
net	IPVS: Use global mutex in ip_vs_app.c	2011-03-21 20:39:24 -07:00
pcmcia
rdma
rxrpc
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-03-17 17:54:40 -07:00
sound	Merge branch 'topic/misc' into for-linus	2011-03-18 07:39:08 +01:00
staging	[media] Altera FPGA firmware download module	2011-03-21 20:32:16 -03:00
target
trace	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2011-03-18 10:46:37 -07:00
video	atmel_lcdfb: implement inverted contrast pwm	2011-03-22 16:23:44 +09:00
xen	Merge branch 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen	2011-03-17 18:37:42 -07:00
Kbuild