* [PATCH 1/1] Documentation/x86: incorrect reference zero-page.txt
@ 2020-10-02 19:06 Heinrich Schuchardt
2020-10-02 20:56 ` [tip: x86/urgent] Documentation/x86: Fix incorrect references to zero-page.txt tip-bot2 for Heinrich Schuchardt
0 siblings, 1 reply; 2+ messages in thread
From: Heinrich Schuchardt @ 2020-10-02 19:06 UTC (permalink / raw)
To: Thomas Gleixner
Cc: Ingo Molnar, Borislav Petkov, x86, H . Peter Anvin,
Jonathan Corbet, linux-kernel, linux-doc, Heinrich Schuchardt
File zero-page.txt does not exit. Add links for zero-page.rst.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
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 5325c71ca877..49c3ebe8a439 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
--
2.28.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: x86/urgent] Documentation/x86: Fix incorrect references to zero-page.txt
2020-10-02 19:06 [PATCH 1/1] Documentation/x86: incorrect reference zero-page.txt Heinrich Schuchardt
@ 2020-10-02 20:56 ` tip-bot2 for Heinrich Schuchardt
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Heinrich Schuchardt @ 2020-10-02 20:56 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Heinrich Schuchardt, Borislav Petkov, x86, LKML
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 <xypron.glpk@gmx.de>
AuthorDate: Fri, 02 Oct 2020 21:06:23 +02:00
Committer: Borislav Petkov <bp@suse.de>
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 <xypron.glpk@gmx.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20201002190623.7489-1-xypron.glpk@gmx.de
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-02 20:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-02 19:06 [PATCH 1/1] Documentation/x86: incorrect reference zero-page.txt Heinrich Schuchardt
2020-10-02 20:56 ` [tip: x86/urgent] Documentation/x86: Fix incorrect references to zero-page.txt tip-bot2 for Heinrich Schuchardt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).