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

Commit d320e203 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 

Pull two x86 fixes from Ingo Molnar.

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/microcode/amd: Tone down printk(), don't treat a missing firmware file as an error
  x86/dumpstack: Fix printk_address for direct addresses
parents fe8a45df 11f918d3

arch/x86/include/asm/kdebug.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ enum die_val { 
	DIE_NMIUNKNOWN,

};



extern void printk_address(unsigned long address, int reliable);

extern void printk_address(unsigned long address);

extern void die(const char *, struct pt_regs *,long);

extern int __must_check __die(const char *, struct pt_regs *, long);

extern void show_trace(struct task_struct *t, struct pt_regs *regs,

arch/x86/kernel/dumpstack.c

+8 −3
Original line number Diff line number Diff line
@@ -25,12 +25,17 @@ unsigned int code_bytes = 64; 
int kstack_depth_to_print = 3 * STACKSLOTS_PER_LINE;

static int die_counter;



void printk_address(unsigned long address, int reliable)

static void printk_stack_address(unsigned long address, int reliable)

{

	pr_cont(" [<%p>] %s%pB\n",

		(void *)address, reliable ? "" : "? ", (void *)address);

}



void printk_address(unsigned long address)

{

	pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);

}



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

static void

print_ftrace_graph_addr(unsigned long addr, void *data,
@@ -151,7 +156,7 @@ static void print_trace_address(void *data, unsigned long addr, int reliable) 
{

	touch_nmi_watchdog();

	printk(data);

	printk_address(addr, reliable);

	printk_stack_address(addr, reliable);

}



static const struct stacktrace_ops print_trace_ops = {
@@ -281,7 +286,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err) 
#else

	/* Executive summary in case the oops scrolled away */

	printk(KERN_ALERT "RIP ");

	printk_address(regs->ip, 1);

	printk_address(regs->ip);

	printk(" RSP <%016lx>\n", regs->sp);

#endif

	return 0;

arch/x86/kernel/microcode_amd.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device, 
		snprintf(fw_name, sizeof(fw_name), "amd-ucode/microcode_amd_fam%.2xh.bin", c->x86);



	if (request_firmware(&fw, (const char *)fw_name, device)) {

		pr_err("failed to load file %s\n", fw_name);

		pr_debug("failed to load file %s\n", fw_name);

		goto out;

	}

arch/x86/kernel/process_64.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ void __show_regs(struct pt_regs *regs, int all) 
	unsigned int ds, cs, es;



	printk(KERN_DEFAULT "RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->ip);

	printk_address(regs->ip, 1);

	printk_address(regs->ip);

	printk(KERN_DEFAULT "RSP: %04lx:%016lx  EFLAGS: %08lx\n", regs->ss,

			regs->sp, regs->flags);

	printk(KERN_DEFAULT "RAX: %016lx RBX: %016lx RCX: %016lx\n",

arch/x86/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code, 


	printk(KERN_CONT " at %p\n", (void *) address);

	printk(KERN_ALERT "IP:");

	printk_address(regs->ip, 1);

	printk_address(regs->ip);



	dump_pagetable(address);

}