| From e8f0f1694c53bc20ff6a148539ee46fc2bd67dc7 Mon Sep 17 00:00:00 2001 |
| From: Denis Efremov <efremov@linux.com> |
| Date: Thu, 29 Aug 2019 00:09:34 +0300 |
| Subject: [PATCH] asm-generic: add unlikely to default BUG_ON(x) |
| |
| commit 9b87647c665dbf93173ca2f43986902b59dfbbba upstream. |
| |
| Add unlikely to default BUG_ON(x) in !CONFIG_BUG. It makes |
| the define consistent with BUG_ON(x) in CONFIG_BUG. |
| |
| Signed-off-by: Denis Efremov <efremov@linux.com> |
| Cc: Arnd Bergmann <arnd@arndb.de> |
| Cc: <linux-arch@vger.kernel.org> |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h |
| index aa6c093d9ce9..7357a3c942a0 100644 |
| --- a/include/asm-generic/bug.h |
| +++ b/include/asm-generic/bug.h |
| @@ -185,7 +185,7 @@ void __warn(const char *file, int line, void *caller, unsigned taint, |
| #endif |
| |
| #ifndef HAVE_ARCH_BUG_ON |
| -#define BUG_ON(condition) do { if (condition) BUG(); } while (0) |
| +#define BUG_ON(condition) do { if (unlikely(condition)) BUG(); } while (0) |
| #endif |
| |
| #ifndef HAVE_ARCH_WARN_ON |
| -- |
| 2.7.4 |
| |
