Commit 901735e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents bb1f1154 5258b80e

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2577,7 +2577,7 @@ menuconfig APM 


	  1) make sure that you have enough swap space and that it is

	  enabled.

	  2) pass the "no-hlt" option to the kernel

	  2) pass the "idle=poll" option to the kernel

	  3) switch on floating point emulation in the kernel and pass

	  the "no387" option to the kernel

	  4) pass the "floppy=nodma" option to the kernel

arch/x86/kernel/dumpstack.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}