diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 11:01:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 11:01:17 -0700 |
| commit | b026188e8214ce87790730a56f3017d0bd222751 (patch) | |
| tree | b4d1e482b1f77360768a5c8e565bfd311ed74232 /Documentation | |
| parent | 1903ac54f8536b11478e4f01c339e10b538f59e0 (diff) | |
| parent | 94bb063312d872d9269deb2e5c0c7c6d5b0318e1 (diff) | |
| download | kernel-crypto-b026188e8214ce87790730a56f3017d0bd222751.tar.gz kernel-crypto-b026188e8214ce87790730a56f3017d0bd222751.tar.xz kernel-crypto-b026188e8214ce87790730a56f3017d0bd222751.zip | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (28 commits)
[S390] rework of channel measurement facility.
[S390] appldata enhancements.
[S390] Add vmpanic parameter.
[S390] add PAV support to the dasd driver.
[S390] remove export of sys_call_table
[S390] remove unused macros from binfmt_elf32.c
[S390] fix duplicate export of overflow{ug}id
[S390] cio chpid offline.
[S390] avenrun export in appdata_base.c
Convert s390_collect_crw_info() in s390mach.c from being started
[S390] dasd eer data format.
[S390] preempt_count initialization.
[S390] head.S code moving.
[S390] dasd whitespace and other cosmetics.
[S390] virtual cpu accounting vs. machine checks.
[S390] add __cpuinit to appldata cpu hotplug notifier.
[S390] dasd_eckd_dump_sense bug.
[S390] missing check in dasd_eer_open.
[S390] modular 3270 driver.
[S390] console_unblank woes.
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 0d189c93eea..25f8d20dac5 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1689,9 +1689,14 @@ running once the system is up. decrease the size and leave more room for directly mapped kernel RAM. - vmhalt= [KNL,S390] + vmhalt= [KNL,S390] Perform z/VM CP command after system halt. + Format: <command> - vmpoff= [KNL,S390] + vmpanic= [KNL,S390] Perform z/VM CP command after kernel panic. + Format: <command> + + vmpoff= [KNL,S390] Perform z/VM CP command after power off. + Format: <command> waveartist= [HW,OSS] Format: <io>,<irq>,<dma>,<dma2> |