From 626149ffc2c38673de1844a5f2317ba2bf92c64f Mon Sep 17 00:00:00 2001 From: Irina Tirdea Date: Sat, 8 Sep 2012 08:35:51 +0300 Subject: [PATCH] --- yaml --- r: 323787 b: refs/heads/master c: 8bf98b89688c3d7ec071bf26d49761e38d846b47 h: refs/heads/master i: 323785: 6bc212df7498b61c9972748284621ae6d7adb294 323783: 72e944a41ee5bf9144ff840d201b8f98a47f9a49 v: v3 --- [refs] | 2 +- trunk/tools/perf/bench/sched-pipe.c | 6 +++--- trunk/tools/perf/util/include/linux/kernel.h | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 26ca4725b8c6..fbb2bb185489 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef34eb4da3eb62a1511592adf7c76d74faca0b14 +refs/heads/master: 8bf98b89688c3d7ec071bf26d49761e38d846b47 diff --git a/trunk/tools/perf/bench/sched-pipe.c b/trunk/tools/perf/bench/sched-pipe.c index 0c7454f8b8a9..15911e9c587a 100644 --- a/trunk/tools/perf/bench/sched-pipe.c +++ b/trunk/tools/perf/bench/sched-pipe.c @@ -56,13 +56,13 @@ int bench_sched_pipe(int argc, const char **argv, * causes error in building environment for perf */ int __used ret, wait_stat; - pid_t pid, retpid; + pid_t pid, retpid __used; argc = parse_options(argc, argv, options, bench_sched_pipe_usage, 0); - assert(!pipe(pipe_1)); - assert(!pipe(pipe_2)); + BUG_ON(pipe(pipe_1)); + BUG_ON(pipe(pipe_2)); pid = fork(); assert(pid >= 0); diff --git a/trunk/tools/perf/util/include/linux/kernel.h b/trunk/tools/perf/util/include/linux/kernel.h index b6842c1d02a8..4af9a10cc2d2 100644 --- a/trunk/tools/perf/util/include/linux/kernel.h +++ b/trunk/tools/perf/util/include/linux/kernel.h @@ -47,8 +47,12 @@ #endif #ifndef BUG_ON +#ifdef NDEBUG +#define BUG_ON(cond) do { if (cond) {} } while (0) +#else #define BUG_ON(cond) assert(!(cond)) #endif +#endif /* * Both need more care to handle endianness