Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit abf0f10948b316b577851ef21c728341f1046552

Authored by Andrew Morton
Committed by Andi Kleen
1 parent e07e23e1fd
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] wire up oops_enter()/oops_exit() 

Implement pause_on_oops() on x86_64.

AK: I redid the patch to do the oops_enter/exit in the existing
oops_begin()/end(). This makes it much shorter.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Andi Kleen <ak@suse.de>

Showing 1 changed file with 3 additions and 0 deletions Side-by-side Diff

arch/x86_64/kernel/traps.c
Diff comments   View file @ abf0f10
... ... @@ -561,6 +561,8 @@
561 561 int cpu = safe_smp_processor_id();
562 562 unsigned long flags;
563 563  
  564 + oops_enter();
  565 +
564 566 /* racy, but better than risking deadlock. */
565 567 local_irq_save(flags);
566 568 if (!spin_trylock(&die_lock)) {
... ... @@ -589,6 +591,7 @@
589 591 spin_unlock_irqrestore(&die_lock, flags);
590 592 if (panic_on_oops)
591 593 panic("Fatal exception");
  594 + oops_exit();
592 595 }
593 596  
594 597 void __kprobes __die(const char * str, struct pt_regs * regs, long err)