Merge branch 'next' into efi-next-merge

Conflicts:
	arch/x86/boot/compressed/eboot.c

1 files changed, 6 insertions, 2 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 10d51c2f10d7..b5e55aab64be 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -992,10 +992,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         Format: {"off" | "on" | "skip[mbr]"}
 
         efi=            [EFI]
-                        Format: { "old_map" }
+                        Format: { "old_map", "nochunk", "noruntime" }
                         old_map [X86-64]: switch to the old ioremap-based EFI
                         runtime services mapping. 32-bit still uses this one by
                         default.
+                        nochunk: disable reading files in "chunks" in the EFI
+                        boot stub, as chunking can cause problems with some
+                        firmware implementations.
+                        noruntime : disable EFI runtime services support
 
         efi_no_storage_paranoia [EFI; X86]
                         Using this parameter you can use more than 50% of
@@ -2166,7 +2170,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
         nodsp           [SH] Disable hardware DSP at boot time.
 
-        noefi           [X86] Disable EFI runtime services support.
+        noefi           Disable EFI runtime services support.
 
         noexec          [IA-64]