From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932116AbYERTEn (ORCPT ); Sun, 18 May 2008 15:04:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761445AbYERSyJ (ORCPT ); Sun, 18 May 2008 14:54:09 -0400 Received: from edna.telenet-ops.be ([195.130.132.58]:58021 "EHLO edna.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761372AbYERSyA (ORCPT ); Sun, 18 May 2008 14:54:00 -0400 Message-Id: <20080518185151.249970412@mail.of.borg> References: <20080518184706.631023070@mail.of.borg> User-Agent: quilt/0.46-1 Date: Sun, 18 May 2008 20:47:12 +0200 From: Geert Uytterhoeven To: Linus Torvalds , Andrew Morton Cc: linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [patch 06/18] m68k: Make gcc aware that BUG() does not return Content-Disposition: inline; filename=m68k-silence-BUG-can-return-warnings.diff Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Geert Uytterhoeven Use `__builtin_trap()' instead of `asm volatile("illegal")' in the m68k BUG() macros (as suggested by Andrew Pinski), to kill warnings in code that assumes BUG() does not return. Signed-off-by: Geert Uytterhoeven --- include/asm-m68k/bug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/include/asm-m68k/bug.h +++ b/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 -- Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds