diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-28 17:42:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-28 17:42:18 -0400 |
| commit | 9a90e09854a3c7cc603ab8fc9163f77bb1f66cfa (patch) | |
| tree | c8c5f767dd2351c9db440f003cc14401583bafd3 /Documentation/kernel-parameters.txt | |
| parent | d372e7fe4698bde3a00b718f7901a0025dda47ef (diff) | |
| parent | d3b383338f105f50724c10a7d81b04a3930e886b (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (27 commits)
ACPI: Don't let acpi_pad needlessly mark TSC unstable
drivers/acpi/sleep.h: Checkpatch cleanup
ACPI: Minor cleanup eliminating redundant PMTIMER_TICKS to NS conversion
ACPI: delete unused c-state promotion/demotion data strucutures
ACPI: video: fix acpi_backlight=video
ACPI: EC: Use kmemdup
drivers/acpi: use kasprintf
ACPI, APEI, EINJ injection parameters support
Add x64 support to debugfs
ACPI, APEI, Use ERST for persistent storage of MCE
ACPI, APEI, Error Record Serialization Table (ERST) support
ACPI, APEI, Generic Hardware Error Source memory error support
ACPI, APEI, UEFI Common Platform Error Record (CPER) header
Unified UUID/GUID definition
ACPI Hardware Error Device (PNP0C33) support
ACPI, APEI, PCIE AER, use general HEST table parsing in AER firmware_first setup
ACPI, APEI, Document for APEI
ACPI, APEI, EINJ support
ACPI, APEI, HEST table parsing
ACPI, APEI, APEI supporting infrastructure
...
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index a5c055066764..1808f1157f30 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -145,11 +145,10 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 145 | 145 | ||
| 146 | acpi= [HW,ACPI,X86] | 146 | acpi= [HW,ACPI,X86] |
| 147 | Advanced Configuration and Power Interface | 147 | Advanced Configuration and Power Interface |
| 148 | Format: { force | off | ht | strict | noirq | rsdt } | 148 | Format: { force | off | strict | noirq | rsdt } |
| 149 | force -- enable ACPI if default was off | 149 | force -- enable ACPI if default was off |
| 150 | off -- disable ACPI if default was on | 150 | off -- disable ACPI if default was on |
| 151 | noirq -- do not use ACPI for IRQ routing | 151 | noirq -- do not use ACPI for IRQ routing |
| 152 | ht -- run only enough ACPI to enable Hyper Threading | ||
| 153 | strict -- Be less tolerant of platforms that are not | 152 | strict -- Be less tolerant of platforms that are not |
| 154 | strictly ACPI specification compliant. | 153 | strictly ACPI specification compliant. |
| 155 | rsdt -- prefer RSDT over (default) XSDT | 154 | rsdt -- prefer RSDT over (default) XSDT |
| @@ -758,6 +757,10 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 758 | Default value is 0. | 757 | Default value is 0. |
| 759 | Value can be changed at runtime via /selinux/enforce. | 758 | Value can be changed at runtime via /selinux/enforce. |
| 760 | 759 | ||
| 760 | erst_disable [ACPI] | ||
| 761 | Disable Error Record Serialization Table (ERST) | ||
| 762 | support. | ||
| 763 | |||
| 761 | ether= [HW,NET] Ethernet cards parameters | 764 | ether= [HW,NET] Ethernet cards parameters |
| 762 | This option is obsoleted by the "netdev=" option, which | 765 | This option is obsoleted by the "netdev=" option, which |
| 763 | has equivalent usage. See its documentation for details. | 766 | has equivalent usage. See its documentation for details. |
| @@ -852,6 +855,11 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 852 | hd= [EIDE] (E)IDE hard drive subsystem geometry | 855 | hd= [EIDE] (E)IDE hard drive subsystem geometry |
| 853 | Format: <cyl>,<head>,<sect> | 856 | Format: <cyl>,<head>,<sect> |
| 854 | 857 | ||
| 858 | hest_disable [ACPI] | ||
| 859 | Disable Hardware Error Source Table (HEST) support; | ||
| 860 | corresponding firmware-first mode error processing | ||
| 861 | logic will be disabled. | ||
| 862 | |||
| 855 | highmem=nn[KMG] [KNL,BOOT] forces the highmem zone to have an exact | 863 | highmem=nn[KMG] [KNL,BOOT] forces the highmem zone to have an exact |
| 856 | size of <nn>. This works even on boxes that have no | 864 | size of <nn>. This works even on boxes that have no |
| 857 | highmem otherwise. This also works to reduce highmem | 865 | highmem otherwise. This also works to reduce highmem |