The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 0c7689830e907668288a1a1da84dca66dbdb4728 Gitweb: https://git.kernel.org/tip/0c7689830e907668288a1a1da84dca66dbdb4728 Author: Heinrich Schuchardt <[email protected]> AuthorDate: Fri, 02 Oct 2020 21:06:23 +02:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Fri, 02 Oct 2020 22:49:29 +02:00
Documentation/x86: Fix incorrect references to zero-page.txt The file zero-page.txt does not exit. Add links to zero-page.rst instead. [ bp: Massage a bit. ] Signed-off-by: Heinrich Schuchardt <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Link: https://lkml.kernel.org/r/[email protected] --- Documentation/x86/boot.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/x86/boot.rst b/Documentation/x86/boot.rst index 7fafc7a..abb9fc1 100644 --- a/Documentation/x86/boot.rst +++ b/Documentation/x86/boot.rst @@ -1342,8 +1342,8 @@ follow:: In addition to read/modify/write the setup header of the struct boot_params as that of 16-bit boot protocol, the boot loader should -also fill the additional fields of the struct boot_params as that -described in zero-page.txt. +also fill the additional fields of the struct boot_params as +described in chapter :doc:`zero-page`. After setting up the struct boot_params, the boot loader can load the 32/64-bit kernel in the same way as that of 16-bit boot protocol. @@ -1379,7 +1379,7 @@ can be calculated as follows:: In addition to read/modify/write the setup header of the struct boot_params as that of 16-bit boot protocol, the boot loader should also fill the additional fields of the struct boot_params as described -in zero-page.txt. +in chapter :doc:`zero-page`. After setting up the struct boot_params, the boot loader can load 64-bit kernel in the same way as that of 16-bit boot protocol, but
