diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 11:41:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 11:41:43 -0400 |
| commit | 1dc60c53d36b08f361e1a2767c41196acce96d08 (patch) | |
| tree | 35966ad2c2465e6f722d199e4b1799fb4c6f2b46 /Documentation | |
| parent | 8d2567a620ae8c24968a2bdc1c906c724fac1f6a (diff) | |
| parent | 3f1c38723eb467d34d704d0ee6e7b796ba4981ee (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Fix compile error with CONFIG_AS_CFI=n
Documentation: document debugpat commandline option
x86: sanitize Kconfig
x86, suspend, acpi: correct and add comments about Big Real Mode
x86, suspend, acpi: enter Big Real Mode
Fixed trivial conflict in include/asm-x86/dwarf2.h due to just using
different names for "cfi_ignore" (vs "__cfi_ignore") macro.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index b3a5aad7e629..681d6152e003 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -571,6 +571,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 571 | 571 | ||
| 572 | debug_objects [KNL] Enable object debugging | 572 | debug_objects [KNL] Enable object debugging |
| 573 | 573 | ||
| 574 | debugpat [X86] Enable PAT debugging | ||
| 575 | |||
| 574 | decnet.addr= [HW,NET] | 576 | decnet.addr= [HW,NET] |
| 575 | Format: <area>[,<node>] | 577 | Format: <area>[,<node>] |
| 576 | See also Documentation/networking/decnet.txt. | 578 | See also Documentation/networking/decnet.txt. |