mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-17 18:51:27 +00:00
Merge of the trunk's r3428-3435:
- Don't allow to create targets with the same names - Remove "unused variable" warning on old kernels - Fix a compiler warning on pre-2.6.35 non-RHEL systems. - Bug fix: do not try to apply patch readahead-2.6.32.below11.patch on kernel 2.6.32.11 or any later 2.6.32 kernel. - Removed the constant REPORT_DEVICE_IDENTIFIER from scst/include/scst_const.h because it is not used anywhere in the SCST source tree. - Expand CONFIG_SCST_PROC too. - Added #include <linux/slab.h> for kmem_cache_free(). - MultiP must be 1 and HiSup 0 git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.1.0.x@3437 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
@@ -116,6 +116,10 @@ svn status -v "$(dirname "$(dirname "$scriptname")")" \
|
||||
| grep -v /in-tree/ \
|
||||
| while read p
|
||||
do
|
||||
echo "==== $p"
|
||||
patch -p1 <$p
|
||||
if [ "${p/readahead-2.6.32.below11.patch//}" = "$p" \
|
||||
-o "${patchlevel:-0}" -lt 11 ]
|
||||
then
|
||||
echo "==== $p"
|
||||
patch -p1 <$p
|
||||
fi
|
||||
done
|
||||
|
||||
@@ -242,6 +242,7 @@ function handle_if(evaluated)
|
||||
# kernel version, and do not interpret other expressions.
|
||||
if ($0 ~ "LINUX_VERSION_CODE" \
|
||||
|| $0 ~ "INSIDE_KERNEL_TREE" \
|
||||
|| $0 ~ "CONFIG_SCST_PROC" \
|
||||
|| $0 ~ "RHEL_MAJOR" \
|
||||
|| $0 ~ "RHEL_MINOR" \
|
||||
|| $0 ~ "RHEL_RELEASE_CODE" \
|
||||
|
||||
Reference in New Issue
Block a user