diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-23 18:42:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-23 18:42:07 -0700 |
| commit | de8ac81747fca15925f3488ead7804560cdea532 (patch) | |
| tree | 70d7b61438ca489e482d94505aaa089cdd33366e /arch/x86/include/asm/bug.h | |
| parent | a13dc4d40938787cfc9e520ed426df4ebf48b1aa (diff) | |
| parent | 69505e3d9a39a988aaed9b58aa6b3482238f6516 (diff) | |
| download | lwn-de8ac81747fca15925f3488ead7804560cdea532.tar.gz lwn-de8ac81747fca15925f3488ead7804560cdea532.zip | |
Merge tag 'x86_core_for_v5.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core x86 updates from Borislav Petkov:
- Remove all the code around GS switching on 32-bit now that it is not
needed anymore
- Other misc improvements
* tag 'x86_core_for_v5.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
bug: Use normal relative pointers in 'struct bug_entry'
x86/nmi: Make register_nmi_handler() more robust
x86/asm: Merge load_gs_index()
x86/32: Remove lazy GS macros
ELF: Remove elf_core_copy_kernel_regs()
x86/32: Simplify ELF_CORE_COPY_REGS
Diffstat (limited to 'arch/x86/include/asm/bug.h')
| -rw-r--r-- | arch/x86/include/asm/bug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h index aaf0cb0db4ae..a3ec87d198ac 100644 --- a/arch/x86/include/asm/bug.h +++ b/arch/x86/include/asm/bug.h @@ -18,7 +18,7 @@ #ifdef CONFIG_X86_32 # define __BUG_REL(val) ".long " __stringify(val) #else -# define __BUG_REL(val) ".long " __stringify(val) " - 2b" +# define __BUG_REL(val) ".long " __stringify(val) " - ." #endif #ifdef CONFIG_DEBUG_BUGVERBOSE |