Merge branch 'svn-trunk'

qla2x00t-32gbit/Makefile

@@ -45,8 +45,9 @@ endif
 INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
 
 ifneq ($(PATCHLEVEL),)
-ccflags-y += $(call cc-option,-Wextra) -Wno-unused-parameter \
-	-Wno-missing-field-initializers -I$(src)/../scst/include -I$(src)\
+ccflags-y += $(call cc-option,-Wextra) -Wno-unused-parameter	\
+	-Wno-missing-field-initializers				\
+	-I$(src)/../scst/include -I$(src)/include		\
 	-DDEFAULT_SYMBOL_NAMESPACE=QLA32GB
 
 ifneq ($(CONFIG_SCSI_QLA2XXX_TARGET),)

qla2x00t-32gbit/extract-qla2xxx-orig

@@ -18,7 +18,12 @@ cd qla2xxx-orig || exit $?
 download_and_extract_kernel_tree "${kernel_version}"
 touch "linux-${kernel_version}"/drivers/scsi/qla2xxx/*
 rm -rf "${kernel_version}"
-mkdir -p "${kernel_version}"
+mkdir -p "${kernel_version}/include/trace/events"
 mv "linux-${kernel_version}"/drivers/scsi/qla2xxx/* "${kernel_version}"
+if [ -e "linux-${kernel_version}"/include/trace/events/qla.h ]; then
+    touch "linux-${kernel_version}"/include/trace/events/qla.h
+    mv "linux-${kernel_version}"/include/trace/events/qla.h \
+       "${kernel_version}/include/trace/events"
+fi
 rm -rf "linux-${kernel_version}"
 cd ..

qla2x00t-32gbit/generate-in-tree-patches

@@ -26,6 +26,19 @@ for g in Kconfig *.[ch]; do
   fi
 done
 
+for g in include/trace/events/qla.h; do
+  f1="qla2xxx-orig/${kernel_version}/$g"
+  f2="$g"
+  f3="in-tree-patches/${kernel_version}/${g#include/trace/events/}.patch"
+  if [ "$f1" -nt "$f3" -o "$f2" -nt "$f3" ]; then
+    if [ -e "$f1" ]; then
+      diff -up "$f1" "$f2" > "$f3"
+    else
+      diff -up /dev/null "$f2" > "$f3"
+    fi
+  fi
+done
+
 for g in Makefile; do
   f1="qla2xxx-orig/${kernel_version}/$g"
   f2="${g}_in-tree"

scripts/generate-kernel-patch

@@ -539,7 +539,11 @@ elif [ "${qla2x00t_32gbit}" = "true" ]; then
     [ -e "$f" ] || continue
     g="${f#qla2x00t-32gbit/in-tree-patches/$1/}"
     g="${g%.patch}"
-    add_patch "${f}" "drivers/scsi/qla2xxx/${g}"
+    if [ "$g" = "qla.h" ]; then
+	add_patch "${f}" "include/trace/events/${g}"
+    else
+	add_patch "${f}" "drivers/scsi/qla2xxx/${g}"
+    fi
   done
 
   for f in qla2x00t-32gbit/qla2x00-target/*.[ch]; do