forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
commit 32032df6c2
10112 changed files with 878752 additions and 447137 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/vmstat.h
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,