diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-01 09:04:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-01 09:04:31 -0700 |
| commit | 11e612ddb4bc667d0b830bfaab3acdf8b86da845 (patch) | |
| tree | a897de8d8974847b57d6355c641466e5565f924a /Documentation/x86 | |
| parent | 5778077d03cb25aac9b6a428e18970642fc019e3 (diff) | |
| parent | 656bba306827a44ed73b3f93f75bb3147de17fae (diff) | |
| download | linux-11e612ddb4bc667d0b830bfaab3acdf8b86da845.tar.gz linux-11e612ddb4bc667d0b830bfaab3acdf8b86da845.tar.bz2 linux-11e612ddb4bc667d0b830bfaab3acdf8b86da845.zip | |
Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 boot updates from Ingo Molnar:
"The main x86 bootup related changes in this cycle were:
- more boot time optimizations. (Len Brown)
- implement hex output to allow the debugging of early bootup
parameters. (Kees Cook)
- remove obsolete MCA leftovers. (Paolo Pisati)"
* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/smpboot: Remove APIC.wait_for_init_deassert and atomic init_deasserted
x86/smpboot: Remove SIPI delays from cpu_up()
x86/smpboot: Remove udelay(100) when polling cpu_callin_map
x86/smpboot: Remove udelay(100) when polling cpu_initialized_map
x86/boot: Obsolete the MCA sys_desc_table
x86/boot: Add hex output for debugging
Diffstat (limited to 'Documentation/x86')
| -rw-r--r-- | Documentation/x86/zero-page.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/x86/zero-page.txt b/Documentation/x86/zero-page.txt index 82fbdbc1e0b0..95a4d34af3fd 100644 --- a/Documentation/x86/zero-page.txt +++ b/Documentation/x86/zero-page.txt @@ -17,7 +17,8 @@ Offset Proto Name Meaning (struct ist_info) 080/010 ALL hd0_info hd0 disk parameter, OBSOLETE!! 090/010 ALL hd1_info hd1 disk parameter, OBSOLETE!! -0A0/010 ALL sys_desc_table System description table (struct sys_desc_table) +0A0/010 ALL sys_desc_table System description table (struct sys_desc_table), + OBSOLETE!! 0B0/010 ALL olpc_ofw_header OLPC's OpenFirmware CIF and friends 0C0/004 ALL ext_ramdisk_image ramdisk_image high 32bits 0C4/004 ALL ext_ramdisk_size ramdisk_size high 32bits |