diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-13 12:25:35 +0300 | 
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-13 12:25:35 +0300 | 
| commit | d2bb1d42b95fa88f092623bbb8ed533f316b6a3c (patch) | |
| tree | fb796db809a266906fa358f24f1c07ced4df33f0 /arch/mips/kernel/sysrq.c | |
| parent | 3bd7617596df560e2cb22ad97888cb42dae39d02 (diff) | |
| parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) | |
| download | linux-d2bb1d42b95fa88f092623bbb8ed533f316b6a3c.tar.xz | |
Merge tag 'v4.3-rc1' into perf/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/kernel/sysrq.c')
| -rw-r--r-- | arch/mips/kernel/sysrq.c | 14 | 
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/mips/kernel/sysrq.c b/arch/mips/kernel/sysrq.c index 5b539f5fc9d9..5f055393092d 100644 --- a/arch/mips/kernel/sysrq.c +++ b/arch/mips/kernel/sysrq.c @@ -21,24 +21,12 @@ static DEFINE_SPINLOCK(show_lock);  static void sysrq_tlbdump_single(void *dummy)  { -	const int field = 2 * sizeof(unsigned long);  	unsigned long flags;  	spin_lock_irqsave(&show_lock, flags);  	pr_info("CPU%d:\n", smp_processor_id()); -	pr_info("Index	: %0x\n", read_c0_index()); -	pr_info("Pagemask: %0x\n", read_c0_pagemask()); -	pr_info("EntryHi : %0*lx\n", field, read_c0_entryhi()); -	pr_info("EntryLo0: %0*lx\n", field, read_c0_entrylo0()); -	pr_info("EntryLo1: %0*lx\n", field, read_c0_entrylo1()); -	pr_info("Wired   : %0x\n", read_c0_wired()); -	pr_info("Pagegrain: %0x\n", read_c0_pagegrain()); -	if (cpu_has_htw) { -		pr_info("PWField : %0*lx\n", field, read_c0_pwfield()); -		pr_info("PWSize  : %0*lx\n", field, read_c0_pwsize()); -		pr_info("PWCtl   : %0x\n", read_c0_pwctl()); -	} +	dump_tlb_regs();  	pr_info("\n");  	dump_tlb_all();  	pr_info("\n");  | 
