Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f3a54b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, dumpstack: Fix code bytes breakage due to missing KERN_CONT
parents 5fbd305d 13f541c1

arch/x86/kernel/dumpstack_32.c

+4 −4
Original line number Diff line number Diff line
@@ -116,16 +116,16 @@ void show_registers(struct pt_regs *regs) 
		for (i = 0; i < code_len; i++, ip++) {

			if (ip < (u8 *)PAGE_OFFSET ||

					probe_kernel_address(ip, c)) {

				printk(" Bad EIP value.");

				printk(KERN_CONT " Bad EIP value.");

				break;

			}

			if (ip == (u8 *)regs->ip)

				printk("<%02x> ", c);

				printk(KERN_CONT "<%02x> ", c);

			else

				printk("%02x ", c);

				printk(KERN_CONT "%02x ", c);

		}

	}

	printk("\n");

	printk(KERN_CONT "\n");

}



int is_valid_bugaddr(unsigned long ip)

arch/x86/kernel/dumpstack_64.c

+4 −4
Original line number Diff line number Diff line
@@ -284,16 +284,16 @@ void show_registers(struct pt_regs *regs) 
		for (i = 0; i < code_len; i++, ip++) {

			if (ip < (u8 *)PAGE_OFFSET ||

					probe_kernel_address(ip, c)) {

				printk(" Bad RIP value.");

				printk(KERN_CONT " Bad RIP value.");

				break;

			}

			if (ip == (u8 *)regs->ip)

				printk("<%02x> ", c);

				printk(KERN_CONT "<%02x> ", c);

			else

				printk("%02x ", c);

				printk(KERN_CONT "%02x ", c);

		}

	}

	printk("\n");

	printk(KERN_CONT "\n");

}



int is_valid_bugaddr(unsigned long ip)