aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2008-04-17 13:13:57 -0400
committerTony Luck <tony.luck@intel.com>2008-04-17 13:13:57 -0400
commitf4df39cbdd9e9ab615e80148cc271db22a8508ad (patch)
tree312fcf9de1154c85782c121a46fa2952f9812292 /Documentation
parenta49072bb367a94a9af6c6a6dcbaa1dc5617d7fa0 (diff)
parenta6c75b86ce9f01db4ea9912877b526c2dc4d2f0a (diff)
Pull nptcg into release branch
Conflicts: arch/ia64/mm/tlb.c
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index dafd001bf833..5389acf9e075 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1339,6 +1339,10 @@ and is between 256 and 4096 characters. It is defined in the file
1339 1339
1340 nowb [ARM] 1340 nowb [ARM]
1341 1341
1342 nptcg= [IA64] Override max number of concurrent global TLB
1343 purges which is reported from either PAL_VM_SUMMARY or
1344 SAL PALO.
1345
1342 numa_zonelist_order= [KNL, BOOT] Select zonelist order for NUMA. 1346 numa_zonelist_order= [KNL, BOOT] Select zonelist order for NUMA.
1343 one of ['zone', 'node', 'default'] can be specified 1347 one of ['zone', 'node', 'default'] can be specified
1344 This can be set from sysctl after boot. 1348 This can be set from sysctl after boot.