From 9e3c7aae43d65c1e13c9738768af5cd2b360ba82 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Sun, 18 May 2008 20:47:12 +0200 Subject: [PATCH] --- yaml --- r: 96864 b: refs/heads/master c: e8006b060f3982a969c5170aa869628d54dd30d8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-m68k/bug.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1eb0fecc343c..4b5c08432682 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb4db450aa19dfc806fbd9747879c420e154dc33 +refs/heads/master: e8006b060f3982a969c5170aa869628d54dd30d8 diff --git a/trunk/include/asm-m68k/bug.h b/trunk/include/asm-m68k/bug.h index 7b60776cc966..e5b528deb8a8 100644 --- a/trunk/include/asm-m68k/bug.h +++ b/trunk/include/asm-m68k/bug.h @@ -7,7 +7,7 @@ #ifndef CONFIG_SUN3 #define BUG() do { \ printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ - asm volatile("illegal"); \ + __builtin_trap(); \ } while (0) #else #define BUG() do { \ @@ -17,7 +17,7 @@ #endif #else #define BUG() do { \ - asm volatile("illegal"); \ + __builtin_trap(); \ } while (0) #endif