diff options
| author | Linus Torvalds | 2022-10-04 10:00:27 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2022-10-04 10:00:27 -0700 |
| commit | 901735e51e4dea1eee816b0b57d1d6abbd94b3d5 (patch) | |
| tree | 3eb9c57b48599d16a2ba131c30946b72d19a3364 /arch/x86/kernel | |
| parent | bb1f11546eb3cd1e2b8ea45653eb0f530e42b035 (diff) | |
| parent | 5258b80e60da6d8908ae2846b234ed8d9d9d4a19 (diff) | |
Merge tag 'x86_misc_for_v6.1_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull misc x86 fixes from Borislav Petkov:
- Drop misleading "RIP" from the opcodes dumping message
- Correct APM entry's Konfig help text
* tag 'x86_misc_for_v6.1_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/dumpstack: Don't mention RIP in "Code: "
x86/Kconfig: Specify idle=poll instead of no-hlt
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/dumpstack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index afae4dd77495..b3dba35f466e 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c @@ -128,7 +128,7 @@ void show_opcodes(struct pt_regs *regs, const char *loglvl) /* No access to the user space stack of other tasks. Ignore. */ break; default: - printk("%sCode: Unable to access opcode bytes at RIP 0x%lx.\n", + printk("%sCode: Unable to access opcode bytes at 0x%lx.\n", loglvl, prologue); break; } |