From patchwork Sat Jul 20 10:39:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 169300 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4987003ilk; Sat, 20 Jul 2019 03:43:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqw0WApeg6P0TffvAK8I3qhEnkgtmCyxn2gI3GBsvWI9tRQJTOo/0raf5jud9GLiQmkutNdp X-Received: by 2002:a17:902:16f:: with SMTP id 102mr60159505plb.94.1563619421474; Sat, 20 Jul 2019 03:43:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563619421; cv=none; d=google.com; s=arc-20160816; b=yiGzd5toe06NGS/jjr5qYwz5NVWmgwLrdyrx1PnibsFISmdh3b16oEtQyo/SS7hiBF w+0mtwoaby72IzkOY2v+xjeXaS0HHxNPlHfETWmlViqDycsShHWPbO5B8oG72Dlo4X46 ypLj7/wyuuLmbXG6q4mn7J7/FeIFWShwXEVncJQk08I2aPnbHgQaa93gmoacTi2w6uPM K6Nmvz/wrZJUnqfbM+FFVZI1xXP7to5Alu0KpATgVGbUFyxJXPEijT7U1z1wmNQozfqt 3J++buJybCV23AYNLHUpBtyZDuch7Af3qzRvcBQRj5DltwPZT0Smzz5YRh19nIyjxOs9 DOsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=mcZz3jn7xyQ5IOn7tDEqK+9jIYpqhpvsTuekSTkT8E8=; b=Ysaw5WOL6xj7jT935eDGM4NkWbOLqPmyyd3DbxfwePVSPjoJ1V5yqoZRqCTl4eqFPc Od3hqguLF+zmZy9NqJM0RlbafMfrKqpiH31r/jkXz+tqNr37ZiD159UxyaXiYeL1Ag9g YYZNZVq5Vuj8Ifh/8cri3T58rRwRmG6Ha0pKMODXH0j5ueCUWyka2zgB6fhQjajwoZkF YqPavsRkkTpXi8ParyMnYWI0FkqLCudmhuE8+etJalZFvFXIYJBWHRfvsH0LPzAMH5lc HaQVweMvZBd1P2yXvhLv0eFvrEXxiWZBBbkDCi9nsm4cmT1NJRXm5GIjNvl9YT4M+vTP 4Bxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=OGQfvAdc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v27si4351354pgn.14.2019.07.20.03.43.40; Sat, 20 Jul 2019 03:43:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=OGQfvAdc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727841AbfGTKlW (ORCPT + 29 others); Sat, 20 Jul 2019 06:41:22 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:16680 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726772AbfGTKlW (ORCPT ); Sat, 20 Jul 2019 06:41:22 -0400 Received: from grover.flets-west.jp (softbank126026094249.bbtec.net [126.26.94.249]) (authenticated) by conuserg-07.nifty.com with ESMTP id x6KAdjWa009191; Sat, 20 Jul 2019 19:39:45 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com x6KAdjWa009191 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1563619186; bh=mcZz3jn7xyQ5IOn7tDEqK+9jIYpqhpvsTuekSTkT8E8=; h=From:To:Cc:Subject:Date:From; b=OGQfvAdcqdQj+0lggjhXj0Xu2G/Nv0V6R+xYAF1FLnQu0zKAABFL7yOTNOkh0x3sT OX+Y0V6D8ZDoo6FMHUhqjgLFWOzsg5JdDdFkH+GoYvXfVECwbVfnlWofCm3L/Yl2Zw an2PUa7Hi7kzHTxNG3rtc4ulJiQ+K4+SrN1Q/F9bu+f3N8+BIZsmqHctzjtYMK6RRD tpX6YvWiEKiI5a8TvKYhp7r26FDoyQNtk79a1rE0/LkQfHVFJ8GvUPHtbWpP6qczi/ IG8nPck3L+E2l7oQF0FAtX+XUgCMKJyrsif9OsByTUbZTXJA9M8/Hmxv0pINYznz+G x6Q/+o1J+7eoA== X-Nifty-SrcIP: [126.26.94.249] From: Masahiro Yamada To: Steven Rostedt , Ingo Molnar Cc: Masahiro Yamada , Ben Dooks , Jonathan Hunter , Thierry Reding , Vinod Koul , linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH] trace: fix header include guards Date: Sat, 20 Jul 2019 19:39:43 +0900 Message-Id: <20190720103943.16982-1-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These include guards are broken. Match the #if !define() and #define lines so that they work correctly. Signed-off-by: Masahiro Yamada --- include/trace/events/dma_fence.h | 2 +- include/trace/events/napi.h | 4 ++-- include/trace/events/qdisc.h | 4 ++-- include/trace/events/tegra_apb_dma.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) -- 2.17.1 diff --git a/include/trace/events/dma_fence.h b/include/trace/events/dma_fence.h index 2212adda8f77..64e92d56c6a8 100644 --- a/include/trace/events/dma_fence.h +++ b/include/trace/events/dma_fence.h @@ -2,7 +2,7 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM dma_fence -#if !defined(_TRACE_FENCE_H) || defined(TRACE_HEADER_MULTI_READ) +#if !defined(_TRACE_DMA_FENCE_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_DMA_FENCE_H #include diff --git a/include/trace/events/napi.h b/include/trace/events/napi.h index f3a12566bed0..6678cf8b235b 100644 --- a/include/trace/events/napi.h +++ b/include/trace/events/napi.h @@ -3,7 +3,7 @@ #define TRACE_SYSTEM napi #if !defined(_TRACE_NAPI_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_NAPI_H_ +#define _TRACE_NAPI_H #include #include @@ -38,7 +38,7 @@ TRACE_EVENT(napi_poll, #undef NO_DEV -#endif /* _TRACE_NAPI_H_ */ +#endif /* _TRACE_NAPI_H */ /* This part must be outside protection */ #include diff --git a/include/trace/events/qdisc.h b/include/trace/events/qdisc.h index 60d0d8bd336d..0d1a9ebf55ba 100644 --- a/include/trace/events/qdisc.h +++ b/include/trace/events/qdisc.h @@ -2,7 +2,7 @@ #define TRACE_SYSTEM qdisc #if !defined(_TRACE_QDISC_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_QDISC_H_ +#define _TRACE_QDISC_H #include #include @@ -44,7 +44,7 @@ TRACE_EVENT(qdisc_dequeue, __entry->txq_state, __entry->packets, __entry->skbaddr ) ); -#endif /* _TRACE_QDISC_H_ */ +#endif /* _TRACE_QDISC_H */ /* This part must be outside protection */ #include diff --git a/include/trace/events/tegra_apb_dma.h b/include/trace/events/tegra_apb_dma.h index 0818f6286110..971cd02d2daf 100644 --- a/include/trace/events/tegra_apb_dma.h +++ b/include/trace/events/tegra_apb_dma.h @@ -1,5 +1,5 @@ #if !defined(_TRACE_TEGRA_APB_DMA_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_TEGRA_APM_DMA_H +#define _TRACE_TEGRA_APB_DMA_H #include #include @@ -55,7 +55,7 @@ TRACE_EVENT(tegra_dma_isr, TP_printk("%s: irq %d\n", __get_str(chan), __entry->irq) ); -#endif /* _TRACE_TEGRADMA_H */ +#endif /* _TRACE_TEGRA_APB_DMA_H */ /* This part must be outside protection */ #include