diff options
| author | Len Brown <len.brown@intel.com> | 2012-03-30 16:12:23 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-03-30 16:14:02 -0400 |
| commit | 73f05330497b98c45d157b7d0c60673798bb4c3b (patch) | |
| tree | 67fc16c0f55c482882aea49eaa1d8d95b23722e0 /Documentation | |
| parent | 1a05e4678724c4a5fe7b9e4e208b616dfe8c3a32 (diff) | |
| parent | 8cdde126aa60ced0d63ff137378e09dd01dfadda (diff) | |
| download | linux-3.10-73f05330497b98c45d157b7d0c60673798bb4c3b.tar.gz linux-3.10-73f05330497b98c45d157b7d0c60673798bb4c3b.tar.bz2 linux-3.10-73f05330497b98c45d157b7d0c60673798bb4c3b.zip | |
Merge branch 'apei' into release
Conflicts:
drivers/acpi/apei/apei-base.c
This was a conflict between
15afae604651d4e17652d2ffb56f5e36f991cfef
(CPI, APEI: Fix incorrect APEI register bit width check and usage)
and
653f4b538f66d37db560e0f56af08117136d29b7
(ACPICA: Expand OSL memory read/write interfaces to 64 bits)
The former changed a parameter in the call to acpi_os_read_memory64()
and the later replaced all calls to acpi_os_read_memory64()
with calls to acpi_os_read_memory().
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/acpi/apei/einj.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/acpi/apei/einj.txt b/Documentation/acpi/apei/einj.txt index e7cc3639721..e20b6daaced 100644 --- a/Documentation/acpi/apei/einj.txt +++ b/Documentation/acpi/apei/einj.txt @@ -53,6 +53,14 @@ directory apei/einj. The following files are provided. This file is used to set the second error parameter value. Effect of parameter depends on error_type specified. +- notrigger + The EINJ mechanism is a two step process. First inject the error, then + perform some actions to trigger it. Setting "notrigger" to 1 skips the + trigger phase, which *may* allow the user to cause the error in some other + context by a simple access to the cpu, memory location, or device that is + the target of the error injection. Whether this actually works depends + on what operations the BIOS actually includes in the trigger phase. + BIOS versions based in the ACPI 4.0 specification have limited options to control where the errors are injected. Your BIOS may support an extension (enabled with the param_extension=1 module parameter, or |