From 5ce36973f7597f7d30fa5481a1591c42aacdf15b Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 4 Dec 2014 11:50:58 +0000 Subject: [PATCH] scripts/generate-kernel-patch: Swap two filters git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5910 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/generate-kernel-patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch index d41d188e9..6c443d974 100755 --- a/scripts/generate-kernel-patch +++ b/scripts/generate-kernel-patch @@ -107,16 +107,16 @@ EOF # passed via stdin and send the specialized patch to stdout. function specialize_patch { if [ "${enable_specialize}" = "true" ]; then + if [ "${generating_upstream_patch}" = "true" ]; then + scripts/filter-trace-entry-exit + else + cat + fi | "$(dirname $0)/specialize-patch" \ ${specialize_patch_options} \ -v kernel_version="${kver3}" \ -v SCSI_EXEC_REQ_FIFO_DEFINED="${scsi_exec_req_fifo_defined}" \ - -v SCST_IO_CONTEXT="${scst_io_context}" \ - | if [ "${generating_upstream_patch}" = "true" ]; then - scripts/filter-trace-entry-exit - else - cat - fi + -v SCST_IO_CONTEXT="${scst_io_context}" else cat fi