On kernel version >= 3.4 we can normally include tracing, only on such old kernel we have to deactivate the tracing code.
Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de> --- .../network/0022-define-tracing/ath6kl.patch | 4 +++- .../network/0022-define-tracing/cfg80211.patch | 8 ++++++-- .../network/0022-define-tracing/wil6210.patch | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/patches/collateral-evolutions/network/0022-define-tracing/ath6kl.patch b/patches/collateral-evolutions/network/0022-define-tracing/ath6kl.patch index 5910f54..b6e8c35 100644 --- a/patches/collateral-evolutions/network/0022-define-tracing/ath6kl.patch +++ b/patches/collateral-evolutions/network/0022-define-tracing/ath6kl.patch @@ -1,10 +1,12 @@ --- a/drivers/net/wireless/ath/ath6kl/trace.c +++ b/drivers/net/wireless/ath/ath6kl/trace.c -@@ -16,6 +16,7 @@ +@@ -16,6 +16,9 @@ #include <linux/module.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0) +#include "trace.h" ++#endif #define CREATE_TRACE_POINTS #include "trace.h" diff --git a/patches/collateral-evolutions/network/0022-define-tracing/cfg80211.patch b/patches/collateral-evolutions/network/0022-define-tracing/cfg80211.patch index eeab23d..8b59837 100644 --- a/patches/collateral-evolutions/network/0022-define-tracing/cfg80211.patch +++ b/patches/collateral-evolutions/network/0022-define-tracing/cfg80211.patch @@ -1,8 +1,12 @@ --- a/net/wireless/trace.c +++ b/net/wireless/trace.c -@@ -1,4 +1,5 @@ +@@ -1,6 +1,9 @@ #include <linux/module.h> -+#include "trace.h" #ifndef __CHECKER__ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0) ++#include "trace.h" ++#endif #define CREATE_TRACE_POINTS + #include "trace.h" + diff --git a/patches/collateral-evolutions/network/0022-define-tracing/wil6210.patch b/patches/collateral-evolutions/network/0022-define-tracing/wil6210.patch index 1888cd7..ec9df86 100644 --- a/patches/collateral-evolutions/network/0022-define-tracing/wil6210.patch +++ b/patches/collateral-evolutions/network/0022-define-tracing/wil6210.patch @@ -1,9 +1,11 @@ --- a/drivers/net/wireless/ath/wil6210/trace.c +++ b/drivers/net/wireless/ath/wil6210/trace.c -@@ -16,5 +16,6 @@ +@@ -16,5 +16,8 @@ #include <linux/module.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0) +#include "trace.h" ++#endif #define CREATE_TRACE_POINTS #include "trace.h" -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe backports" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
