From: "tip-bot2 for Heinrich Schuchardt" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>,
Borislav Petkov <bp@suse.de>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: x86/urgent] Documentation/x86: Fix incorrect references to zero-page.txt
Date: Fri, 02 Oct 2020 20:56:13 -0000 [thread overview]
Message-ID: <160167217377.7002.573244513258205543.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20201002190623.7489-1-xypron.glpk@gmx.de>
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
prev parent reply other threads:[~2020-10-02 20:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=160167217377.7002.573244513258205543.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.org \
--cc=xypron.glpk@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®