Commit c415b53a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_mm_for_v5.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 mm fixlet from Borislav Petkov:

 - A sparse address space annotation fix

* tag 'x86_mm_for_v5.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/fault: Cast an argument to the proper address space in prefetch()
parents e36ae229 944fad45

arch/x86/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr) 
		unsigned char opcode;



		if (user_mode(regs)) {

			if (get_user(opcode, instr))

			if (get_user(opcode, (unsigned char __user *) instr))

				break;

		} else {

			if (get_kernel_nofault(opcode, instr))