Merge tag 'signed-for-3.16' of git://github.com/agraf/linux-2.6 into kvm-master

[karo-tx-linux.git] / scripts / tags.sh

diff --git a/scripts/tags.sh b/scripts/tags.sh
index f2c5b006a3d73534d12fcb8c213ae140db4bae4e..e6b011fe1d0d1dfd850f345f55f0a7f057d6435d 100755 (executable)
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -25,6 +25,9 @@ else
        tree=${srctree}/
 fi
 
+# ignore userspace tools
+ignore="$ignore ( -path ${tree}tools ) -prune -o"
+
 # Find all available archs
 find_all_archs()
 {
@@ -47,7 +50,8 @@ find_arch_sources()
        for i in $archincludedir; do
                prune="$prune -wholename $i -prune -o"
        done
-       find ${tree}arch/$1 $ignore $subarchprune $prune -name "$2" -print;
+       find ${tree}arch/$1 $ignore $subarchprune $prune -name "$2" \
+               -not -type l -print;
 }
 
 # find sources in arch/$1/include
@@ -57,14 +61,15 @@ find_arch_include_sources()
                                        -name include -type d -print);
        if [ -n "$include" ]; then
                archincludedir="$archincludedir $include"
-               find $include $ignore -name "$2" -print;
+               find $include $ignore -name "$2" -not -type l -print;
        fi
 }
 
 # find sources in include/
 find_include_sources()
 {
-       find ${tree}include $ignore -name config -prune -o -name "$1" -print;
+       find ${tree}include $ignore -name config -prune -o -name "$1" \
+               -not -type l -print;
 }
 
 # find sources in rest of tree
@@ -73,7 +78,7 @@ find_other_sources()
 {
        find ${tree}* $ignore \
             \( -name include -o -name arch -o -name '.tmp_*' \) -prune -o \
-              -name "$1" -print;
+              -name "$1" -not -type l -print;
 }
 
 find_sources()
@@ -187,6 +192,10 @@ exuberant()
        --regex-c++='/TESTCLEARFLAG_FALSE\(([^,)]*).*/TestClearPage\1/' \
        --regex-c++='/__TESTCLEARFLAG_FALSE\(([^,)]*).*/__TestClearPage\1/' \
        --regex-c++='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/'                \
+       --regex-c++='/TESTPCGFLAG\(([^,)]*).*/PageCgroup\1/'            \
+       --regex-c++='/SETPCGFLAG\(([^,)]*).*/SetPageCgroup\1/'          \
+       --regex-c++='/CLEARPCGFLAG\(([^,)]*).*/ClearPageCgroup\1/'      \
+       --regex-c++='/TESTCLEARPCGFLAG\(([^,)]*).*/TestClearPageCgroup\1/' \
        --regex-c='/PCI_OP_READ\((\w*).*[1-4]\)/pci_bus_read_config_\1/' \
        --regex-c='/PCI_OP_WRITE\((\w*).*[1-4]\)/pci_bus_write_config_\1/' \
        --regex-c='/DEFINE_(MUTEX|SEMAPHORE|SPINLOCK)\((\w*)/\2/v/'     \
@@ -201,7 +210,8 @@ exuberant()
        --regex-c='/DECLARE_(TASKLET|WORK|DELAYED_WORK)\((\w*)/\2/v/'   \
        --regex-c='/DEFINE_PCI_DEVICE_TABLE\((\w*)/\1/v/'               \
        --regex-c='/(^\s)OFFSET\((\w*)/\2/v/'                           \
-       --regex-c='/(^\s)DEFINE\((\w*)/\2/v/'
+       --regex-c='/(^\s)DEFINE\((\w*)/\2/v/'                           \
+       --regex-c='/DEFINE_HASHTABLE\((\w*)/\1/v/'
 
        all_kconfigs | xargs $1 -a                              \
        --langdef=kconfig --language-force=kconfig              \
@@ -244,9 +254,14 @@ emacs()
        --regex='/__CLEARPAGEFLAG_NOOP(\([^,)]*\).*/__ClearPage\1/' \
        --regex='/TESTCLEARFLAG_FALSE(\([^,)]*\).*/TestClearPage\1/' \
        --regex='/__TESTCLEARFLAG_FALSE(\([^,)]*\).*/__TestClearPage\1/' \
+       --regex='/TESTPCGFLAG\(([^,)]*).*/PageCgroup\1/'        \
+       --regex='/SETPCGFLAG\(([^,)]*).*/SetPageCgroup\1/'      \
+       --regex='/CLEARPCGFLAG\(([^,)]*).*/ClearPageCgroup\1/'  \
+       --regex='/TESTCLEARPCGFLAG\(([^,)]*).*/TestClearPageCgroup\1/' \
        --regex='/_PE(\([^,)]*\).*/PEVENT_ERRNO__\1/'           \
        --regex='/PCI_OP_READ(\([a-z]*[a-z]\).*[1-4])/pci_bus_read_config_\1/' \
-       --regex='/PCI_OP_WRITE(\([a-z]*[a-z]\).*[1-4])/pci_bus_write_config_\1/'
+       --regex='/PCI_OP_WRITE(\([a-z]*[a-z]\).*[1-4])/pci_bus_write_config_\1/'\
+       --regex='/DEFINE_HASHTABLE\((\w*)/\1/v/'
 
        all_kconfigs | xargs $1 -a                              \
        --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'
@@ -266,7 +281,7 @@ xtags()
                emacs $1
        else
                all_target_sources | xargs $1 -a
-        fi
+       fi
 }
 
 # Support um (which uses SUBARCH)