summaryrefslogtreecommitdiffstats
path: root/Documentation/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-06-22 17:10:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-22 17:10:44 -0700
commitcfe3eceb7a2eb91284d5605c5315249bb165e9d3 (patch)
treea18d2440ae8dac55119ef13b8b434431408ddc1b /Documentation/x86
parent5ef6ca4f24b59af7f7c2c19502a3923a4bc10e0a (diff)
parentd4f7743542f20c2b20b68bba856c281ba9c84e42 (diff)
downloadlinux-cfe3eceb7a2eb91284d5605c5315249bb165e9d3.tar.gz
linux-cfe3eceb7a2eb91284d5605c5315249bb165e9d3.tar.bz2
linux-cfe3eceb7a2eb91284d5605c5315249bb165e9d3.zip
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 EFI updates from Ingo Molnar: "EFI changes: - Use idiomatic negative error values in efivar_create_sysfs_entry() instead of returning '1' to indicate error (Dan Carpenter) - Implement new support to expose the EFI System Resource Tables in sysfs, which provides information for performing firmware updates (Peter Jones) - Documentation cleanup in the EFI handover protocol section which falsely claimed that 'cmdline_size' needed to be filled out by the boot loader (Alex Smith) - Align the order of SMBIOS tables in /sys/firmware/efi/systab to match the way that we do things for ACPI and add documentation to Documentation/ABI (Jean Delvare)" * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: efi: Work around ia64 build problem with ESRT driver efi: Add 'systab' information to Documentation/ABI efi: dmi: List SMBIOS3 table before SMBIOS table efi/esrt: Fix some compiler warnings x86, doc: Remove cmdline_size from list of fields to be filled in for EFI handover efi: Add esrt support efi: efivar_create_sysfs_entry() should return negative error codes
Diffstat (limited to 'Documentation/x86')
-rw-r--r--Documentation/x86/boot.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt
index 88b85899d309..7c1f9fad6674 100644
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
@@ -1124,7 +1124,6 @@ The boot loader *must* fill out the following fields in bp,
o hdr.code32_start
o hdr.cmd_line_ptr
- o hdr.cmdline_size
o hdr.ramdisk_image (if applicable)
o hdr.ramdisk_size (if applicable)