diff options
author | Sean Christopherson <sean.j.christopherson@intel.com> | 2019-11-26 11:59:11 -0800 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2019-12-16 14:09:33 +0100 |
commit | 957a227d413b06130b7d57d1954d821edf6991c1 (patch) | |
tree | e218781500875717c49c82ff6d3f95f0bfc5d6cc | |
parent | 27353d5785bca61bb49cfd7c78e14f1d21e66ec5 (diff) | |
download | linux-stable-957a227d413b06130b7d57d1954d821edf6991c1.tar.gz linux-stable-957a227d413b06130b7d57d1954d821edf6991c1.tar.bz2 linux-stable-957a227d413b06130b7d57d1954d821edf6991c1.zip |
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
-rw-r--r-- | arch/x86/include/asm/realmode.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h index 09ecc32f6524..b35030eeec36 100644 --- a/arch/x86/include/asm/realmode.h +++ b/arch/x86/include/asm/realmode.h @@ -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; |