Frederic Weisbecker 4d8438f044 res_counter: Merge res_counter_charge and res_counter_charge_nofail ... These two functions do almost the same thing and duplicate some code. Merge their implementation into a single common function. res_counter_charge_locked() takes one more parameter but it doesn't seem to be used outside res_counter.c yet anyway. There is no (intended) change in the behaviour. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: Glauber Costa <glommer@parallels.com> Acked-by: Kirill A. Shutemov <kirill@shutemov.name> Cc: Li Zefan <lizefan@huawei.com>		2012-04-27 14:36:45 -07:00
..
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-03-30 16:45:39 -07:00
asm-generic	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-29 18:12:23 -07:00
crypto	crypto: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:16 +08:00
drm	The following text was taken from the original review request:	2012-03-24 10:08:39 -07:00
keys
linux	res_counter: Merge res_counter_charge and res_counter_charge_nofail	2012-04-27 14:36:45 -07:00
math-emu
media	The following text was taken from the original review request:	2012-03-24 10:41:37 -07:00
misc
mtd
net	cgroup: pass struct mem_cgroup instead of struct cgroup to socket memcg	2012-04-10 10:04:07 -07:00
pcmcia
rdma	Merge branches 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iser', 'mad', 'nes', 'qib', 'srp' and 'srpt' into for-next	2012-03-19 09:50:33 -07:00
rxrpc
scsi	SCSI updates on 20120331	2012-03-31 13:31:23 -07:00
sound	The following text was taken from the original review request:	2012-03-24 10:41:37 -07:00
target	target: Use array_zalloc for device_list	2012-03-15 19:15:51 -07:00
trace	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-03-30 12:44:29 -07:00
video	Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm	2012-03-27 18:17:02 -07:00
xen	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
Kbuild