Gitweb:     http://git.kernel.org/linus/ed391f4ebf8f701d3566423ce8f17e614cde9806
Commit:     ed391f4ebf8f701d3566423ce8f17e614cde9806
Parent:     57f4c226d1e095a2db20c691c3cf089188fe1c5d
Author:     Tejun Heo <tj@kernel.org>
AuthorDate: Tue Mar 23 15:55:39 2010 +0900
Committer:  Tejun Heo <tj@kernel.org>
CommitDate: Tue Mar 30 22:02:21 2010 +0900

    iwlwifi: don't include iwl-dev.h from iwl-devtrace.h
    
    iwl-devtrace.h is used to declare and define trace points and
    including iwl-dev.h from the file, which in turn includes other
    generic headers, can lead to problems like generating duplicate copies
    of generic trace points depending on the order of includes.  Don't
    include iwl-dev.h from iwl-devtrace.h but include it from its users -
    iwl-io.h and iwl-devtrace.c.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Acked-by: Reinette Chatre <reinette.chatre@intel.com>
    Cc: Zhu Yi <yi.zhu@intel.com>
    Cc: Intel Linux Wireless <ilw@linux.intel.com>
    Cc: Ingo Molnar <mingo@redhat.com>
---
 drivers/net/wireless/iwlwifi/iwl-devtrace.c |    2 ++
 drivers/net/wireless/iwlwifi/iwl-devtrace.h |    1 -
 drivers/net/wireless/iwlwifi/iwl-io.h       |    1 +
 3 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.c b/drivers/net/wireless/iwlwifi/iwl-devtrace.c
index 36580d8..2ffc2ed 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace.c
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.c
@@ -28,6 +28,8 @@
 
 /* sparse doesn't like tracepoint macros */
 #ifndef __CHECKER__
+#include "iwl-dev.h"
+
 #define CREATE_TRACE_POINTS
 #include "iwl-devtrace.h"
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.h b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
index ff4d012..ae7319b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-devtrace.h
+++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
@@ -28,7 +28,6 @@
 #define __IWLWIFI_DEVICE_TRACE
 
 #include <linux/tracepoint.h>
-#include "iwl-dev.h"
 
 #if !defined(CONFIG_IWLWIFI_DEVICE_TRACING) || defined(__CHECKER__)
 #undef TRACE_EVENT
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h
index c719baf..16eb3ce 100644
--- a/drivers/net/wireless/iwlwifi/iwl-io.h
+++ b/drivers/net/wireless/iwlwifi/iwl-io.h
@@ -31,6 +31,7 @@
 
 #include <linux/io.h>
 
+#include "iwl-dev.h"
 #include "iwl-debug.h"
 #include "iwl-devtrace.h"
 
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html