Commit 957a227d authored Nov 26, 2019 by Sean Christopherson Committed by Borislav Petkov Dec 16, 2019

x86/boot: Fix a comment's incorrect file reference



Fix the comment for 'struct real_mode_header' to reference the correct
assembly file, realmode/rm/header.S.  The comment has always incorrectly
referenced realmode.S, which doesn't exist, as defining the associated
asm blob.

Specify the file's path relative to arch/x86 to avoid confusion with
boot/header.S.  Update the comment for 'struct trampoline_header' to
also include the relative path to keep things consistent, and tweak the
dual 64/32 reference so that it doesn't appear to be an extension of the
relative path, i.e. avoid "realmode/rm/trampoline_32/64.S".

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20191126195911.3429-1-sean.j.christopherson@intel.com

parent 27353d57

arch/x86/include/asm/realmode.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		#include <linux/types.h>
		#include <asm/io.h>

		/* This must match data at realmode.S */
		/* This must match data at realmode/rm/header.S */
		struct real_mode_header {
		u32 text_start;
		u32 ro_end;
		@@ -36,7 +36,7 @@ struct real_mode_header {
		#endif
		};

		/* This must match data at trampoline_32/64.S */
		/* This must match data at realmode/rm/trampoline_{32,64}.S */
		struct trampoline_header {
		#ifdef CONFIG_X86_32
		u32 start;

Admin message