From 53cecbbc58a413836a6e71d8b30a522bdd194f60 Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Fri, 24 Mar 2006 03:15:16 -0800
Subject: [PATCH] --- yaml --- r: 23368 b: refs/heads/master c:
 4896cef8e33e668734234543afb58eb171476ff3 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/asm-s390/bug.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b1722c33cde3..8944db033efe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e8b1c4083a7f0f1e671ea16e23b78d1c8d3e0aa
+refs/heads/master: 4896cef8e33e668734234543afb58eb171476ff3
diff --git a/trunk/include/asm-s390/bug.h b/trunk/include/asm-s390/bug.h
index a2e7430aafa6..7ddaa05b98d8 100644
--- a/trunk/include/asm-s390/bug.h
+++ b/trunk/include/asm-s390/bug.h
@@ -4,9 +4,10 @@
 #include <linux/kernel.h>
 
 #ifdef CONFIG_BUG
+
 #define BUG() do { \
-        printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
-        __asm__ __volatile__(".long 0"); \
+	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
+	__builtin_trap(); \
 } while (0)
 
 #define HAVE_ARCH_BUG