diff options
author | Colin Cross <ccross@android.com> | 2013-06-25 16:02:11 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-25 16:02:11 -0700 |
commit | e4c510cea03a2759e4a5b766990f0c5339a4895a (patch) | |
tree | 43ad4e3ac967d45cf5e5ed7379b98e067e727a4e | |
parent | 8a807c3192fac171190c462010789399f67b3de8 (diff) | |
parent | 057f15a2f24057493af335f0a05e362aceb8db6d (diff) | |
download | extras-e4c510cea03a2759e4a5b766990f0c5339a4895a.tar.gz |
am 057f15a2: am 111659ee: Merge changes I707570ad,I900b673d,I62310b2c,I6b030d9d,I8f5a55de,I51a12fb8,I857143a5,I95025d52,I6367555d,I7d80e2b4,If4a4a2bb,I884eedea,Ibd0b26e4,Ia145018d,I2706e6fb,Ib1467329
* commit '057f15a2f24057493af335f0a05e362aceb8db6d':
procrank: add support for only showing cached, noncached, or KSM pages
libpagemap: add pm_process_usage_flags
librank: add flag to show only KSM pages
libpagemap: fix new kernel flag names to start with PM_PAGE_
librank: show swapped pages per library
procrank: show swapped pages per process
libpagemap: count swapped pages
librank: add command line argument for cached or non-cached pages
libpagemap: add pm_map_usage_flags
librank: add command line argument to show all mappings
libpagemap: add page flags for new kernels
librank: add permissions command line argument
libpagemap: add definition for mask of permission flags
librank: convert argument parsing to getopt_long
libpagemap: fix vss calculation
libpagemap: fix reusing previous name for mappings with no name
0 files changed, 0 insertions, 0 deletions