Commit 3fad0953 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull debug-for-linus git tree from Ingo Molnar.

Fix up trivial conflict in arch/x86/kernel/cpu/perf_event_intel.c due to
a printk() having changed to a pr_info() differently in the two branches.

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Move call to print_modules() out of show_regs()
  x86/mm: Mark free_initrd_mem() as __init
  x86/microcode: Mark microcode_id[] as __initconst
  x86/nmi: Clean up register_nmi_handler() usage
  x86: Save cr2 in NMI in case NMIs take a page fault (for i386)
  x86: Remove cmpxchg from i386 NMI nesting code
  x86: Save cr2 in NMI in case NMIs take a page fault
  x86/debug: Add KERN_<LEVEL> to bare printks, convert printks to pr_<level>
parents a065de0d 0fa0e2f0

arch/x86/include/asm/floppy.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static irqreturn_t floppy_hardint(int irq, void *dev_id) 
		virtual_dma_residue += virtual_dma_count;

		virtual_dma_count = 0;

#ifdef TRACE_FLPY_INT

		printk("count=%x, residue=%x calls=%d bytes=%d dma_wait=%d\n",

		printk(KERN_DEBUG "count=%x, residue=%x calls=%d bytes=%d dma_wait=%d\n",

		       virtual_dma_count, virtual_dma_residue, calls, bytes,

		       dma_wait);

		calls = 0;

arch/x86/include/asm/nmi.h

+3 −17
Original line number Diff line number Diff line
@@ -44,23 +44,9 @@ struct nmiaction { 
	const char		*name;

};



#define register_nmi_handler(t, fn, fg, n)		\

#define register_nmi_handler(t, fn, fg, n, init...)	\

({							\

	static struct nmiaction fn##_na = {		\

		.handler = (fn),			\

		.name = (n),				\

		.flags = (fg),				\

	};						\

	__register_nmi_handler((t), &fn##_na);	\

})



/*

 * For special handlers that register/unregister in the

 * init section only.  This should be considered rare.

 */

#define register_nmi_handler_initonly(t, fn, fg, n)		\

({							\

	static struct nmiaction fn##_na __initdata = {		\

	static struct nmiaction init fn##_na = {	\

		.handler = (fn),			\

		.name = (n),				\

		.flags = (fg),				\

arch/x86/include/asm/pci_x86.h

+6 −2
Original line number Diff line number Diff line
@@ -7,9 +7,13 @@ 
#undef DEBUG



#ifdef DEBUG

#define DBG(x...) printk(x)

#define DBG(fmt, ...) printk(fmt, ##__VA_ARGS__)

#else

#define DBG(x...)

#define DBG(fmt, ...)				\

do {						\

	if (0)					\

		printk(fmt, ##__VA_ARGS__);	\

} while (0)

#endif



#define PCI_PROBE_BIOS		0x0001

arch/x86/include/asm/pgtable-2level.h

+2 −2
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
#define _ASM_X86_PGTABLE_2LEVEL_H



#define pte_ERROR(e) \

	printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, (e).pte_low)

	pr_err("%s:%d: bad pte %08lx\n", __FILE__, __LINE__, (e).pte_low)

#define pgd_ERROR(e) \

	printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))

	pr_err("%s:%d: bad pgd %08lx\n", __FILE__, __LINE__, pgd_val(e))



/*

 * Certain architectures need to do special things when PTEs

arch/x86/include/asm/pgtable-3level.h

+3 −3
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@ 
 */



#define pte_ERROR(e)							\

	printk("%s:%d: bad pte %p(%08lx%08lx).\n",			\

	pr_err("%s:%d: bad pte %p(%08lx%08lx)\n",			\

	       __FILE__, __LINE__, &(e), (e).pte_high, (e).pte_low)

#define pmd_ERROR(e)							\

	printk("%s:%d: bad pmd %p(%016Lx).\n",				\

	pr_err("%s:%d: bad pmd %p(%016Lx)\n",				\

	       __FILE__, __LINE__, &(e), pmd_val(e))

#define pgd_ERROR(e)							\

	printk("%s:%d: bad pgd %p(%016Lx).\n",				\

	pr_err("%s:%d: bad pgd %p(%016Lx)\n",				\

	       __FILE__, __LINE__, &(e), pgd_val(e))



/* Rules for using set_pte: the pte being assigned *must* be

CRA Git | Maintained and supported by SUSTech CRA and CCSE