Kirill A. Shutemov
3cd14fcd3f
thp: account anon transparent huge pages into NR_ANON_PAGES ...
We use NR_ANON_PAGES as base for reporting AnonPages to user. There's
not much sense in not accounting transparent huge pages there, but add
them on printing to user.
Let's account transparent huge pages in NR_ANON_PAGES in the first place.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Hugh Dickins <hughd@google.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Matthew Wilcox <willy@linux.intel.com>
Cc: Hillf Danton <dhillf@gmail.com>
Cc: Ning Qu <quning@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-09-12 15:38:03 -07:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2013-09-05 09:31:03 -07:00
Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2013-09-03 18:19:53 -07:00
atm: he: print MAC via %pM
2013-09-04 14:41:55 -04:00
thp: account anon transparent huge pages into NR_ANON_PAGES
2013-09-12 15:38:03 -07:00
pktcdvd: fix defective misuses of pkt_<level>
2013-09-11 15:59:34 -07:00
ARM: SoC platform changes for 3.12
2013-09-06 13:30:06 -07:00
tpm: convert tpm_tis driver to use dev_pm_ops from legacy pm_ops
2013-09-11 15:58:16 -07:00
The common clk framework changes for 3.12 are dominated by clock driver
2013-09-09 15:49:04 -07:00
The common clk framework changes for 3.12 are dominated by clock driver
2013-09-09 15:49:04 -07:00
ACPI and power management updates for 3.12-rc1
2013-09-03 15:59:39 -07:00
ARM: SoC drivers for v3.12
2013-09-09 16:08:13 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
2013-09-07 12:53:35 +10:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2013-09-10 13:37:36 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
2013-09-06 11:14:33 -07:00
Driver core patches for 3.12-rc1
2013-09-03 11:37:15 -07:00
firmware/dmi_scan: drop OOM messages
2013-09-11 15:58:51 -07:00
Device tree core updates for v3.12
2013-09-10 13:53:52 -07:00
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
2013-09-10 20:05:57 -07:00
Revert "Input: introduce BTN/ABS bits for drums and guitars"
2013-09-07 09:48:41 -07:00
Drivers: hv: vmbus: Do not attempt to negoatiate a new version prematurely
2013-08-30 12:08:04 -07:00
hwmon: (ina2xx) Remove casting the return value which is a void pointer
2013-09-10 06:28:31 -07:00
i2c: rcar: add rcar-H2 support
2013-09-04 11:49:16 +01:00
ide: sgiioc4: Staticize ioc4_ide_attach_one()
2013-09-05 15:21:30 -04:00
staging tree merge for 3.12-rc1
2013-09-03 11:37:57 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-09-06 09:36:28 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-09-07 10:38:46 -07:00
drivers/iommu: remove unnecessary platform_set_drvdata()
2013-09-11 15:56:24 -07:00
ARM: SoC late changes for v3.12
2013-09-09 16:35:29 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-09-05 14:54:29 -07:00
ARM: SoC board updates for 3.12
2013-09-06 13:34:43 -07:00
lguest: fix guest kernel stack overflow when TF bit set.
2013-09-06 08:09:27 +09:30
Add the ability to collect I/O statistics on user-defined regions of a
2013-09-10 13:06:15 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-09-06 10:49:42 -07:00
ARM: SoC platform changes for 3.12
2013-09-06 13:30:06 -07:00
memstick: add support for legacy memorysticks
2013-09-11 15:59:35 -07:00
For the 3.12 merge window we have one new driver for the DA9063 PMIC
2013-09-07 20:14:19 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-09-05 08:50:26 -07:00
MMC highlights for 3.12:
2013-09-10 13:33:09 -07:00
- factor out common code from MTD tests
2013-09-09 10:33:19 -07:00
net: qmi_wwan: add new Qualcomm devices
2013-09-11 17:14:13 -04:00
ntb: clean up unnecessary MSI/MSI-X capability find
2013-09-05 11:08:01 -07:00
Merge branch 'for-v3.12-fix' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2013-09-11 19:11:59 -07:00
oprofile: get rid of pointless forward declarations of struct super_block
2013-09-03 22:52:48 -04:00
PCI changes for the v3.12 merge window:
2013-09-03 16:24:35 -07:00
drivers: parport: Kconfig: exclude h8300 for PARPORT_PC
2013-08-30 12:08:04 -07:00
ARM: SoC platform changes for 3.12
2013-09-06 13:30:06 -07:00
PTR_RET() is a weird name, and led to some confusing usage. We ended
2013-09-04 17:31:11 -07:00
platform: convert apple-gmux driver to dev_pm_ops from legacy pm_ops
2013-09-11 15:58:16 -07:00
pnp: change pnp bus pm_ops to invoke pnp driver dev_pm_ops if specified
2013-09-11 15:58:15 -07:00
New drivers:
2013-09-10 22:58:14 -07:00
drivers/pps/clients/pps-gpio.c: remove unnecessary platform_set_drvdata()
2013-09-11 15:59:34 -07:00
ARM: SoC cleanups for 3.12
2013-09-06 13:21:16 -07:00
PTR_RET() is a weird name, and led to some confusing usage. We ended
2013-09-04 17:31:11 -07:00
rtc: simplify devm_request_mem_region/devm_ioremap
2013-09-11 15:58:59 -07:00
s390/vmcore: use vmcore for zfcpdump
2013-09-11 15:59:15 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-09-06 09:36:28 -07:00
ARM: SoC DT updates for 3.12
2013-09-06 13:26:27 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-09-05 14:54:29 -07:00
target: Fix se_cmd->state_list leak regression during WRITE failure
2013-08-31 15:19:12 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-09-07 10:38:46 -07:00
Driver core patches for 3.12-rc1
2013-09-03 11:37:15 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-09-06 10:49:42 -07:00
vfio-pci: PCI hot reset interface
2013-09-04 11:28:04 -06:00
vhost_net: correctly limit the max pending buffers
2013-09-03 22:46:58 -04:00
Bye, bye, WfW flag
2013-09-11 19:55:12 -07:00
virtio_pci: pm: Use CONFIG_PM_SLEEP instead of CONFIG_PM
2013-09-09 10:02:53 +09:30
drivers/w1/masters/mxc_w1.c: remove unnecessary platform_set_drvdata()
2013-09-11 15:59:36 -07:00
lto, watchdog/hpwdt.c: make assembler label global
2013-09-11 15:58:21 -07:00
Features:
2013-09-04 17:45:39 -07:00
3cd14fcd3f