diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-20 18:33:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-20 18:33:59 -0400 |
| commit | 919d25a710bd6ded210426e911c9f9ec535d8d9c (patch) | |
| tree | 7c49ecdc8cba950a582951ae8ee450153c0840f2 /Documentation | |
| parent | e6625fa48e6580a74b7e700efd7e6463e282810b (diff) | |
| parent | 3628c3f5c818cfc6e588d1ccb31f19aa12345c02 (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86. reboot: Make Dell Latitude E6320 use reboot=pci
x86, doc only: Correct real-mode kernel header offset for init_size
x86: Disable AMD_NUMA for 32bit for now
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/x86/boot.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt index 9b7221a86df2..7c3a8801b7ce 100644 --- a/Documentation/x86/boot.txt +++ b/Documentation/x86/boot.txt | |||
| @@ -674,7 +674,7 @@ Protocol: 2.10+ | |||
| 674 | 674 | ||
| 675 | Field name: init_size | 675 | Field name: init_size |
| 676 | Type: read | 676 | Type: read |
| 677 | Offset/size: 0x25c/4 | 677 | Offset/size: 0x260/4 |
| 678 | 678 | ||
| 679 | This field indicates the amount of linear contiguous memory starting | 679 | This field indicates the amount of linear contiguous memory starting |
| 680 | at the kernel runtime start address that the kernel needs before it | 680 | at the kernel runtime start address that the kernel needs before it |