diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 03:53:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 03:53:27 -0400 |
| commit | c0c770e610cc4cdcd66c7e939bdf89cc3e72f79d (patch) | |
| tree | 7cf6807258fef2a85a2ff212f4f4eb6d9dc336c6 /Documentation | |
| parent | a9e4e6e14c322e08d1c615afc8f504fb415f9613 (diff) | |
| parent | d0e323b47057f4492b8fa22345f38d80a469bf8d (diff) | |
Merge branch 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI, APEI, EINJ Param support is disabled by default
APEI GHES: 32-bit buildfix
ACPI: APEI build fix
ACPI, APEI, GHES: Add hardware memory error recovery support
HWPoison: add memory_failure_queue()
ACPI, APEI, GHES, Error records content based throttle
ACPI, APEI, GHES, printk support for recoverable error via NMI
lib, Make gen_pool memory allocator lockless
lib, Add lock-less NULL terminated single list
Add Kconfig option ARCH_HAVE_NMI_SAFE_CMPXCHG
ACPI, APEI, Add WHEA _OSC support
ACPI, APEI, Add APEI bit support in generic _OSC call
ACPI, APEI, GHES, Support disable GHES at boot time
ACPI, APEI, GHES, Prevent GHES to be built as module
ACPI, APEI, Use apei_exec_run_optional in APEI EINJ and ERST
ACPI, APEI, Add apei_exec_run_optional
ACPI, APEI, GHES, Do not ratelimit fatal error printk before panic
ACPI, APEI, ERST, Fix erst-dbg long record reading issue
ACPI, APEI, ERST, Prevent erst_dbg from loading if ERST is disabled
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/acpi/apei/einj.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/acpi/apei/einj.txt b/Documentation/acpi/apei/einj.txt index dfab71848dc8..5cc699ba5453 100644 --- a/Documentation/acpi/apei/einj.txt +++ b/Documentation/acpi/apei/einj.txt | |||
| @@ -48,12 +48,19 @@ directory apei/einj. The following files are provided. | |||
| 48 | - param1 | 48 | - param1 |
| 49 | This file is used to set the first error parameter value. Effect of | 49 | This file is used to set the first error parameter value. Effect of |
| 50 | parameter depends on error_type specified. For memory error, this is | 50 | parameter depends on error_type specified. For memory error, this is |
| 51 | physical memory address. | 51 | physical memory address. Only available if param_extension module |
| 52 | parameter is specified. | ||
| 52 | 53 | ||
| 53 | - param2 | 54 | - param2 |
| 54 | This file is used to set the second error parameter value. Effect of | 55 | This file is used to set the second error parameter value. Effect of |
| 55 | parameter depends on error_type specified. For memory error, this is | 56 | parameter depends on error_type specified. For memory error, this is |
| 56 | physical memory address mask. | 57 | physical memory address mask. Only available if param_extension |
| 58 | module parameter is specified. | ||
| 59 | |||
| 60 | Injecting parameter support is a BIOS version specific extension, that | ||
| 61 | is, it only works on some BIOS version. If you want to use it, please | ||
| 62 | make sure your BIOS version has the proper support and specify | ||
| 63 | "param_extension=y" in module parameter. | ||
| 57 | 64 | ||
| 58 | For more information about EINJ, please refer to ACPI specification | 65 | For more information about EINJ, please refer to ACPI specification |
| 59 | version 4.0, section 17.5. | 66 | version 4.0, section 17.5. |