From patchwork Thu Dec 22 02:39:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 9484139 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AC76E6016C for ; Thu, 22 Dec 2016 02:40:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A36E9282E2 for ; Thu, 22 Dec 2016 02:40:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 975B128410; Thu, 22 Dec 2016 02:40:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D163283D4 for ; Thu, 22 Dec 2016 02:40:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934518AbcLVCkr (ORCPT ); Wed, 21 Dec 2016 21:40:47 -0500 Received: from mail.kernel.org ([198.145.29.136]:33898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933793AbcLVCkM (ORCPT ); Wed, 21 Dec 2016 21:40:12 -0500 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EAD4B20451; Thu, 22 Dec 2016 02:40:10 +0000 (UTC) Received: from garbanzo.do-not-panic.com (c-73-15-241-2.hsd1.ca.comcast.net [73.15.241.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 837292044C; Thu, 22 Dec 2016 02:40:07 +0000 (UTC) From: "Luis R. Rodriguez" To: hpa@zytor.com, acme@redhat.com, tglx@linutronix.de, mingo@redhat.com, jpoimboe@redhat.com, bp@alien8.de, npiggin@gmail.com, mhiramat@kernel.org, masami.hiramatsu.pt@hitachi.com, jbaron@akamai.com, heiko.carstens@de.ibm.com, ananth@linux.vnet.ibm.com, anil.s.keshavamurthy@intel.com, davem@davemloft.net, realmz6@gmail.com, dalias@libc.org, linux@arm.linux.org.uk Cc: x86@kernel.org, luto@amacapital.net, keescook@chromium.org, linux@roeck-us.net, torvalds@linux-foundation.org, gregkh@linuxfoundation.org, rusty@rustcorp.com.au, gnomes@lxorguk.ukuu.org.uk, alan@linux.intel.com, dwmw2@infradead.org, arnd@arndb.de, ming.lei@canonical.com, linux-arch@vger.kernel.org, benh@kernel.crashing.org, pebolle@tiscali.nl, fontana@sharpeleven.org, david.vrabel@citrix.com, konrad.wilk@oracle.com, mcb30@ipxe.org, jgross@suse.com, andrew.cooper3@citrix.com, andriy.shevchenko@linux.intel.com, paul.gortmaker@windriver.com, xen-devel@lists.xensource.com, ak@linux.intel.com, pali.rohar@gmail.com, dvhart@infradead.org, platform-driver-x86@vger.kernel.org, mmarek@suse.com, linux@rasmusvillemoes.dk, jkosina@suse.cz, korea.drzix@gmail.com, linux-kbuild@vger.kernel.org, tony.luck@intel.com, akpm@linux-foundation.org, linux-ia64@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, rostedt@goodmis.org, jani.nikula@intel.com, mchehab@osg.samsung.com, markus.heiser@darmarit.de, jolsa@kernel.org, msalter@redhat.com, chris@zankel.net, jcmvbkbc@gmail.com, linux-xtensa@linux-xtensa.org, adrian.hunter@intel.com, dsahern@gmail.com, namhyung@kernel.org, wangnan0@huawei.com, dmitry.torokhov@gmail.com, joro@8bytes.org, paulus@samba.org, mpe@ellerman.id.au, James.Bottomley@HansenPartnership.com, "Luis R. Rodriguez" Subject: [PATCH v2 1/6] tools: add a userspace tools bug.h Date: Wed, 21 Dec 2016 18:39:53 -0800 Message-Id: <20161222023958.21306-2-mcgrof@kernel.org> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161222023958.21306-1-mcgrof@kernel.org> References: <1471642875-5957-1-git-send-email-mcgrof@kernel.org> <20161222023958.21306-1-mcgrof@kernel.org> X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This will be used later by the userspace linker-tables sandbox. As a convenience, include bug.h on kernel.h -- this is not done on upstream kernel.h, however most header files do include bug.h eventually, if we were to only add the ones that need it we'd need to copy a lot of headers to tools for the ony purpose of includeing bug.h. This simplifies that. Signed-off-by: Luis R. Rodriguez --- tools/include/asm-generic/bug.h | 24 ++++++++++++++++++++++++ tools/include/linux/bug.h | 6 ++++++ tools/include/linux/kernel.h | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 tools/include/asm-generic/bug.h create mode 100644 tools/include/linux/bug.h diff --git a/tools/include/asm-generic/bug.h b/tools/include/asm-generic/bug.h new file mode 100644 index 000000000000..7b0f48b60dbe --- /dev/null +++ b/tools/include/asm-generic/bug.h @@ -0,0 +1,24 @@ +#ifndef __TOOLS_ASM_GENERIC_BUG +#define __TOOLS_ASM_GENERIC_BUG + +#include +#include + +#define BUG() do { \ + fprintf(stderr, "----------------------------------------------------------\n"); \ + fprintf (stderr, "BUG on %s at %s: %i\n", __func__, __FILE__, __LINE__); \ + abort(); \ +} \ +while (0) + +#define BUG_ON(cond) do { if (cond) BUG(); } while (0) + +#define WARN_ON(__test) do { \ + if (__test) { \ + fprintf(stderr, "----------------------------------------------------------\n");\ + fprintf (stderr, "WARN_ON on %s at %s: %i\n", __func__, __FILE__, __LINE__); \ + } \ +} \ +while (0) + +#endif /* __TOOLS_ASM_GENERIC_BUG */ diff --git a/tools/include/linux/bug.h b/tools/include/linux/bug.h new file mode 100644 index 000000000000..9be515b40b5c --- /dev/null +++ b/tools/include/linux/bug.h @@ -0,0 +1,6 @@ +#ifndef _TOOLS_LINUX_BUG_H +#define _TOOLS_LINUX_BUG_H + +#include + +#endif /* _TOOLS_LINUX_BUG_H */ diff --git a/tools/include/linux/kernel.h b/tools/include/linux/kernel.h index 28607db02bd3..3d385a6d4fc1 100644 --- a/tools/include/linux/kernel.h +++ b/tools/include/linux/kernel.h @@ -5,6 +5,8 @@ #include #include +#include + #define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d)) #define PERF_ALIGN(x, a) __PERF_ALIGN_MASK(x, (typeof(x))(a)-1)