diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-03-20 12:56:18 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-03-20 12:56:18 +0300 |
| commit | edc39c9b4589a4ce9a69273b5a27a1459c3423d4 (patch) | |
| tree | e5850fe4a533579b0de12c02e48f7dcdd60e8e38 /arch/arc/include/asm/bug.h | |
| parent | a06cc94f3f8dfab74fe7fac3a6e9f15d77566d00 (diff) | |
| parent | 1b5f3ba415fe4cf8b8b39c8d104ed44cde330658 (diff) | |
| download | linux-edc39c9b4589a4ce9a69273b5a27a1459c3423d4.tar.xz | |
Merge branch 'linus' into x86/build to pick up dependencies
Diffstat (limited to 'arch/arc/include/asm/bug.h')
| -rw-r--r-- | arch/arc/include/asm/bug.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arc/include/asm/bug.h b/arch/arc/include/asm/bug.h index ea022d47896c..21ec82466d62 100644 --- a/arch/arc/include/asm/bug.h +++ b/arch/arc/include/asm/bug.h @@ -23,7 +23,8 @@ void die(const char *str, struct pt_regs *regs, unsigned long address); #define BUG() do { \ pr_warn("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \ - dump_stack(); \ + barrier_before_unreachable(); \ + __builtin_trap(); \ } while (0) #define HAVE_ARCH_BUG |