apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into percpu

Browse Source 
Conflicts:
	arch/powerpc/platforms/pseries/hvCall.S
	include/linux/percpu.h
This commit is contained in:
Tejun Heo
2010-01-05 09:17:33 +09:00
parent 22b737f4c7 c5974b835a
commit 32032df6c2
10112 changed files with 878730 additions and 447115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/vmstat.h
+2
View File
@@ -40,6 +40,8 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
PGSCAN_ZONE_RECLAIM_FAILED,
#endif
PGINODESTEAL, SLABS_SCANNED, KSWAPD_STEAL, KSWAPD_INODESTEAL,
KSWAPD_LOW_WMARK_HIT_QUICKLY, KSWAPD_HIGH_WMARK_HIT_QUICKLY,
KSWAPD_SKIP_CONGESTION_WAIT,
PAGEOUTRUN, ALLOCSTALL, PGROTATED,
#ifdef CONFIG_HUGETLB_PAGE
HTLB_BUDDY_PGALLOC, HTLB_BUDDY_PGALLOC_FAIL,