diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 12:19:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 12:19:20 -0400 |
| commit | 1aaf2e59135fd67321f47c11c64a54aac27014e9 (patch) | |
| tree | 633ffa4db3ac6e8d566cba549510561ffd61d8f4 /Documentation/x86 | |
| parent | 66a4fe0cb80a9fde8cb173289afb863fd279466a (diff) | |
| parent | 936e894a976dd3b0f07f1f6f43c17b77b7e6146d (diff) | |
Merge branch 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, intel_txt: clean up the impact on generic code, unbreak non-x86
x86, intel_txt: Handle ACPI_SLEEP without X86_TRAMPOLINE
x86, intel_txt: Fix typos in Kconfig help
x86, intel_txt: Factor out the code for S3 setup
x86, intel_txt: tboot.c needs <asm/fixmap.h>
intel_txt: Force IOMMU on for Intel TXT launch
x86, intel_txt: Intel TXT Sx shutdown support
x86, intel_txt: Intel TXT reboot/halt shutdown support
x86, intel_txt: Intel TXT boot support
Diffstat (limited to 'Documentation/x86')
| -rw-r--r-- | Documentation/x86/zero-page.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/x86/zero-page.txt b/Documentation/x86/zero-page.txt index 4f913857b8a2..feb37e177010 100644 --- a/Documentation/x86/zero-page.txt +++ b/Documentation/x86/zero-page.txt | |||
| @@ -12,6 +12,7 @@ Offset Proto Name Meaning | |||
| 12 | 000/040 ALL screen_info Text mode or frame buffer information | 12 | 000/040 ALL screen_info Text mode or frame buffer information |
| 13 | (struct screen_info) | 13 | (struct screen_info) |
| 14 | 040/014 ALL apm_bios_info APM BIOS information (struct apm_bios_info) | 14 | 040/014 ALL apm_bios_info APM BIOS information (struct apm_bios_info) |
| 15 | 058/008 ALL tboot_addr Physical address of tboot shared page | ||
| 15 | 060/010 ALL ist_info Intel SpeedStep (IST) BIOS support information | 16 | 060/010 ALL ist_info Intel SpeedStep (IST) BIOS support information |
| 16 | (struct ist_info) | 17 | (struct ist_info) |
| 17 | 080/010 ALL hd0_info hd0 disk parameter, OBSOLETE!! | 18 | 080/010 ALL hd0_info hd0 disk parameter, OBSOLETE!! |