patches/13-trace.patch

   1 Older kernels do not have trace/define_trace.h [1] and if there
   2 is something there that we can backport we will define it
   3 in or compat headers.
   4
   5 [1] http://lxr.linux.no/#linux+v2.6.31/include/trace/define_trace.h
   6
   7 --- a/drivers/net/wireless/iwlwifi/iwl-devtrace.h
   8 +++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.h
   9 @@ -27,7 +27,9 @@
  10  #if !defined(__IWLWIFI_DEVICE_TRACE) || defined(TRACE_HEADER_MULTI_READ)
  11  #define __IWLWIFI_DEVICE_TRACE
  12
  13 +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27))
  14  #include <linux/tracepoint.h>
  15 +#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) */
  16  #include "iwl-dev.h"
  17
  18  #if !defined(CONFIG_IWLWIFI_DEVICE_TRACING) || defined(__CHECKER__)
  19 @@ -264,4 +266,6 @@ TRACE_EVENT(iwlwifi_dev_ucode_event,
  20  #define TRACE_INCLUDE_PATH .
  21  #undef TRACE_INCLUDE_FILE
  22  #define TRACE_INCLUDE_FILE iwl-devtrace
  23 +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30))
  24  #include <trace/define_trace.h>
  25 +#endif
  26 --- a/net/mac80211/driver-trace.h
  27 +++ b/net/mac80211/driver-trace.h
  28 @@ -1,7 +1,9 @@
  29  #if !defined(__MAC80211_DRIVER_TRACE) || defined(TRACE_HEADER_MULTI_READ)
  30  #define __MAC80211_DRIVER_TRACE
  31
  32 +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27))
  33  #include <linux/tracepoint.h>
  34 +#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) */
  35  #include <net/mac80211.h>
  36  #include "ieee80211_i.h"
  37
  38 @@ -772,4 +774,6 @@ TRACE_EVENT(drv_flush,
  39  #define TRACE_INCLUDE_PATH .
  40  #undef TRACE_INCLUDE_FILE
  41  #define TRACE_INCLUDE_FILE driver-trace
  42 +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30))
  43  #include <trace/define_trace.h>
  44 +#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,30)) */