summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-06-14 12:19:23 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2015-06-30 23:07:42 +0200
commit5981a2a89831e3dd57e5a5c7ef8a0117ebedc5c5 (patch)
tree3bf29c34e5f9b3be0e238fddc52151d42295af33
parent8ae6ce099909d2be3f8ad1960d32eda2cf1f6676 (diff)
patches: fix tracing on older kernels for cfg80211, ath6kl and wil6210
Upstream commit: 159a2d35d22e8269efdfa17fe6e33fe3e2b18cf4 On kernel 3.0 we have to include linux/interrupt.h, because it otherwise results in a long compile errors about missing HI_SOFTIRQ for example. It looks like it was not possible to activate tracing without this patch on these drivers at all. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--patches/collateral-evolutions/network/0022-define-tracing/ath6kl.patch8
-rw-r--r--patches/collateral-evolutions/network/0022-define-tracing/cfg80211.patch6
-rw-r--r--patches/collateral-evolutions/network/0022-define-tracing/wil6210.patch7
3 files changed, 14 insertions, 7 deletions
diff --git a/patches/collateral-evolutions/network/0022-define-tracing/ath6kl.patch b/patches/collateral-evolutions/network/0022-define-tracing/ath6kl.patch
index 5910f54d..bdf455aa 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 @@
+@@ -15,6 +15,9 @@
+ */
#include <linux/module.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
++#include <linux/interrupt.h>
++#endif
-+#include "trace.h"
#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 eeab23db..95a0d6a8 100644
--- a/patches/collateral-evolutions/network/0022-define-tracing/cfg80211.patch
+++ b/patches/collateral-evolutions/network/0022-define-tracing/cfg80211.patch
@@ -1,8 +1,10 @@
--- a/net/wireless/trace.c
+++ b/net/wireless/trace.c
-@@ -1,4 +1,5 @@
+@@ -1,4 +1,7 @@
#include <linux/module.h>
-+#include "trace.h"
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
++#include <linux/interrupt.h>
++#endif
#ifndef __CHECKER__
#define CREATE_TRACE_POINTS
diff --git a/patches/collateral-evolutions/network/0022-define-tracing/wil6210.patch b/patches/collateral-evolutions/network/0022-define-tracing/wil6210.patch
index 1888cd7c..5f4b43b9 100644
--- a/patches/collateral-evolutions/network/0022-define-tracing/wil6210.patch
+++ b/patches/collateral-evolutions/network/0022-define-tracing/wil6210.patch
@@ -1,9 +1,12 @@
--- a/drivers/net/wireless/ath/wil6210/trace.c
+++ b/drivers/net/wireless/ath/wil6210/trace.c
-@@ -16,5 +16,6 @@
+@@ -15,6 +15,9 @@
+ */
#include <linux/module.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
++#include <linux/interrupt.h>
++#endif
-+#include "trace.h"
#define CREATE_TRACE_POINTS
#include "trace.h"