Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull misc kbuild updates from Michal Marek:
 - Fix for make O=... perf-tar*
 - make tags revamp and fix for the fallout.  Patch for warnings about
   line breaks inside DEFINE_PER_CPU macros is pending
 - New coccinelle test

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  coccinelle: tests: unsigned value cannot be lesser than zero
  tags: Unify emacs and exuberant rules
  tags: Drop the _PE rule
  tags: Do not try to index defconfigs
  tags: Process Kconfig files in a single pass
  tags: Fix erroneous pattern match in a comment
  aic7xxx: Avoid name collision with <linux/list.h>
  tags: Treat header files as C code
  package Makefile: fix perf-tar targets when outdir is set
  scripts/tags.sh: Teach tags about more powerpc macros

8 files changed, 188 insertions, 124 deletions

diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h
index df2e0e5367d2..d47b527b25dd 100644
--- a/drivers/scsi/aic7xxx/aic79xx.h
+++ b/drivers/scsi/aic7xxx/aic79xx.h
@@ -624,7 +624,7 @@ struct scb {
 };
 
 TAILQ_HEAD(scb_tailq, scb);
-LIST_HEAD(scb_list, scb);
+BSD_LIST_HEAD(scb_list, scb);
 
 struct scb_data {
         /*
@@ -1069,7 +1069,7 @@ struct ahd_softc {
         /*
          * SCBs that have been sent to the controller
          */
-        LIST_HEAD(, scb)          pending_scbs;
+        BSD_LIST_HEAD(, scb)      pending_scbs;
 
         /*
          * Current register window mode information.
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h
index c58fa33c6592..728193a42e6e 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -65,11 +65,6 @@
 /* Core SCSI definitions */
 #define AIC_LIB_PREFIX ahd
 
-/* Name space conflict with BSD queue macros */
-#ifdef LIST_HEAD
-#undef LIST_HEAD
-#endif
-
 #include "cam.h"
 #include "queue.h"
 #include "scsi_message.h"
diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h
index f695774645c1..4ce4e903a759 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.h
+++ b/drivers/scsi/aic7xxx/aic7xxx.h
@@ -916,7 +916,7 @@ struct ahc_softc {
         /*
          * SCBs that have been sent to the controller
          */
-        LIST_HEAD(, scb)          pending_scbs;
+        BSD_LIST_HEAD(, scb)      pending_scbs;
 
         /*
          * Counting lock for deferring the release of additional
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h
index bc4cca92ff04..54c702864103 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.h
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -82,11 +82,6 @@
 /* Core SCSI definitions */
 #define AIC_LIB_PREFIX ahc
 
-/* Name space conflict with BSD queue macros */
-#ifdef LIST_HEAD
-#undef LIST_HEAD
-#endif
-
 #include "cam.h"
 #include "queue.h"
 #include "scsi_message.h"
diff --git a/drivers/scsi/aic7xxx/queue.h b/drivers/scsi/aic7xxx/queue.h
index 8adf8003a164..ba602981f193 100644
--- a/drivers/scsi/aic7xxx/queue.h
+++ b/drivers/scsi/aic7xxx/queue.h
@@ -246,7 +246,7 @@ struct {								\
 /*
  * List declarations.
  */
-#define LIST_HEAD(name, type)                                           \
+#define BSD_LIST_HEAD(name, type)                                       \
 struct name {                                                           \
         struct type *lh_first;  /* first element */                     \
 }
diff --git a/scripts/coccinelle/tests/unsigned_lesser_than_zero.cocci b/scripts/coccinelle/tests/unsigned_lesser_than_zero.cocci
new file mode 100644
index 000000000000..8fa5a3c7b784
--- /dev/null
+++ b/scripts/coccinelle/tests/unsigned_lesser_than_zero.cocci
@@ -0,0 +1,75 @@
+/// Unsigned expressions cannot be lesser than zero. Presence of
+/// comparisons 'unsigned (<|<=|>|>=) 0' often indicates a bug,
+/// usually wrong type of variable.
+///
+/// To reduce number of false positives following tests have been added:
+/// - parts of range checks are skipped, eg. "if (u < 0 || u > 15) ...",
+///   developers prefer to keep such code,
+/// - comparisons "<= 0" and "> 0" are performed only on results of
+///   signed functions/macros,
+/// - hardcoded list of signed functions/macros with always non-negative
+///   result is used to avoid false positives difficult to detect by other ways
+///
+// Confidence: Average
+// Copyright: (C) 2015 Andrzej Hajda, Samsung Electronics Co., Ltd. GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Options: --all-includes
+
+virtual context
+virtual org
+virtual report
+
+@r_cmp@
+position p;
+typedef bool, u8, u16, u32, u64;
+{unsigned char, unsigned short, unsigned int, unsigned long, unsigned long long,
+        size_t, bool, u8, u16, u32, u64} v;
+expression e;
+@@
+
+        \( v = e \| &v \)
+        ...
+        (\( v@p < 0 \| v@p <= 0 \| v@p >= 0 \| v@p > 0 \))
+
+@r@
+position r_cmp.p;
+typedef s8, s16, s32, s64;
+{char, short, int, long, long long, ssize_t, s8, s16, s32, s64} vs;
+expression c, e, v;
+identifier f !~ "^(ata_id_queue_depth|btrfs_copy_from_user|dma_map_sg|dma_map_sg_attrs|fls|fls64|gameport_time|get_write_extents|nla_len|ntoh24|of_flat_dt_match|of_get_child_count|uart_circ_chars_pending|[A-Z0-9_]+)$";
+@@
+
+(
+        v = f(...)@vs;
+        ... when != v = e;
+*       (\( v@p <=@e 0 \| v@p >@e 0 \))
+        ... when any
+|
+(
+        (\( v@p < 0 \| v@p <= 0 \)) || ... || (\( v >= c \| v > c \))
+|
+        (\( v >= c \| v > c \)) || ... || (\( v@p < 0 \| v@p <= 0 \))
+|
+        (\( v@p >= 0 \| v@p > 0 \)) && ... && (\( v < c \| v <= c \))
+|
+        ((\( v < c \| v <= c \) && ... && \( v@p >= 0 \| v@p > 0 \)))
+|
+*       (\( v@p <@e 0 \| v@p >=@e 0 \))
+)
+)
+
+@script:python depends on org@
+p << r_cmp.p;
+e << r.e;
+@@
+
+msg = "WARNING: Unsigned expression compared with zero: %s" % (e)
+coccilib.org.print_todo(p[0], msg)
+
+@script:python depends on report@
+p << r_cmp.p;
+e << r.e;
+@@
+
+msg = "WARNING: Unsigned expression compared with zero: %s" % (e)
+coccilib.report.print_report(p[0], msg)
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 1aca224e8597..c2c7389bfbab 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -118,12 +118,12 @@ quiet_cmd_perf_tar = TAR
       cmd_perf_tar = \
 git --git-dir=$(srctree)/.git archive --prefix=$(perf-tar)/         \
         HEAD^{tree} $$(cd $(srctree);                               \
-                       echo $$(cat $(srctree)/tools/perf/MANIFEST)) \
+                       echo $$(cat tools/perf/MANIFEST)) \
         -o $(perf-tar).tar;                                         \
 mkdir -p $(perf-tar);                                               \
 git --git-dir=$(srctree)/.git rev-parse HEAD > $(perf-tar)/HEAD;    \
 (cd $(srctree)/tools/perf;                                          \
-util/PERF-VERSION-GEN ../../$(perf-tar)/ 2>/dev/null);              \
+util/PERF-VERSION-GEN $(CURDIR)/$(perf-tar)/);              \
 tar rf $(perf-tar).tar $(perf-tar)/HEAD $(perf-tar)/PERF-VERSION-FILE; \
 rm -r $(perf-tar);                                                  \
 $(if $(findstring tar-src,$@),,                                     \
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 76f131ebc192..23ba1c6a0a59 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Generate tags or cscope files
 # Usage tags.sh <mode>
 #
@@ -134,11 +134,6 @@ all_kconfigs()
         find_other_sources 'Kconfig*'
 }
 
-all_defconfigs()
-{
-        find_sources $ALLSOURCE_ARCHS "defconfig"
-}
-
 docscope()
 {
         (echo \-k; echo \-q; all_target_sources) > cscope.files
@@ -150,8 +145,107 @@ dogtags()
         all_target_sources | gtags -i -f -
 }
 
+# Basic regular expressions with an optional /kind-spec/ for ctags and
+# the following limitations:
+# - No regex modifiers
+# - Use \{0,1\} instead of \?, because etags expects an unescaped ?
+# - \s is not working with etags, use a space or [ \t]
+# - \w works, but does not match underscores in etags
+# - etags regular expressions have to match at the start of a line;
+#   a ^[^#] is prepended by setup_regex unless an anchor is already present
+regex_asm=(
+        '/^\(ENTRY\|_GLOBAL\)(\([[:alnum:]_\\]*\)).*/\2/'
+)
+regex_c=(
+        '/^SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/sys_\1/'
+        '/^COMPAT_SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/compat_sys_\1/'
+        '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1/'
+        '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1_rcuidle/'
+        '/^DEFINE_EVENT([^,)]*, *\([[:alnum:]_]*\).*/trace_\1/'
+        '/^DEFINE_EVENT([^,)]*, *\([[:alnum:]_]*\).*/trace_\1_rcuidle/'
+        '/^PAGEFLAG(\([[:alnum:]_]*\).*/Page\1/'
+        '/^PAGEFLAG(\([[:alnum:]_]*\).*/SetPage\1/'
+        '/^PAGEFLAG(\([[:alnum:]_]*\).*/ClearPage\1/'
+        '/^TESTSETFLAG(\([[:alnum:]_]*\).*/TestSetPage\1/'
+        '/^TESTPAGEFLAG(\([[:alnum:]_]*\).*/Page\1/'
+        '/^SETPAGEFLAG(\([[:alnum:]_]*\).*/SetPage\1/'
+        '/\<__SETPAGEFLAG(\([[:alnum:]_]*\).*/__SetPage\1/'
+        '/\<TESTCLEARFLAG(\([[:alnum:]_]*\).*/TestClearPage\1/'
+        '/\<__TESTCLEARFLAG(\([[:alnum:]_]*\).*/TestClearPage\1/'
+        '/\<CLEARPAGEFLAG(\([[:alnum:]_]*\).*/ClearPage\1/'
+        '/\<__CLEARPAGEFLAG(\([[:alnum:]_]*\).*/__ClearPage\1/'
+        '/^__PAGEFLAG(\([[:alnum:]_]*\).*/__SetPage\1/'
+        '/^__PAGEFLAG(\([[:alnum:]_]*\).*/__ClearPage\1/'
+        '/^PAGEFLAG_FALSE(\([[:alnum:]_]*\).*/Page\1/'
+        '/\<TESTSCFLAG(\([[:alnum:]_]*\).*/TestSetPage\1/'
+        '/\<TESTSCFLAG(\([[:alnum:]_]*\).*/TestClearPage\1/'
+        '/\<SETPAGEFLAG_NOOP(\([[:alnum:]_]*\).*/SetPage\1/'
+        '/\<CLEARPAGEFLAG_NOOP(\([[:alnum:]_]*\).*/ClearPage\1/'
+        '/\<__CLEARPAGEFLAG_NOOP(\([[:alnum:]_]*\).*/__ClearPage\1/'
+        '/\<TESTCLEARFLAG_FALSE(\([[:alnum:]_]*\).*/TestClearPage\1/'
+        '/^TASK_PFA_TEST([^,]*, *\([[:alnum:]_]*\))/task_\1/'
+        '/^TASK_PFA_SET([^,]*, *\([[:alnum:]_]*\))/task_set_\1/'
+        '/^TASK_PFA_CLEAR([^,]*, *\([[:alnum:]_]*\))/task_clear_\1/'
+        '/^DEF_MMIO_\(IN\|OUT\)_[XD](\([[:alnum:]_]*\),[^)]*)/\2/'
+        '/^DEBUGGER_BOILERPLATE(\([[:alnum:]_]*\))/\1/'
+        '/^DEF_PCI_AC_\(\|NO\)RET(\([[:alnum:]_]*\).*/\2/'
+        '/^PCI_OP_READ(\(\w*\).*[1-4])/pci_bus_read_config_\1/'
+        '/^PCI_OP_WRITE(\(\w*\).*[1-4])/pci_bus_write_config_\1/'
+        '/\<DEFINE_\(MUTEX\|SEMAPHORE\|SPINLOCK\)(\([[:alnum:]_]*\)/\2/v/'
+        '/\<DEFINE_\(RAW_SPINLOCK\|RWLOCK\|SEQLOCK\)(\([[:alnum:]_]*\)/\2/v/'
+        '/\<DECLARE_\(RWSEM\|COMPLETION\)(\([[:alnum:]_]\+\)/\2/v/'
+        '/\<DECLARE_BITMAP(\([[:alnum:]_]*\)/\1/v/'
+        '/\(^\|\s\)\(\|L\|H\)LIST_HEAD(\([[:alnum:]_]*\)/\3/v/'
+        '/\(^\|\s\)RADIX_TREE(\([[:alnum:]_]*\)/\2/v/'
+        '/\<DEFINE_PER_CPU([^,]*, *\([[:alnum:]_]*\)/\1/v/'
+        '/\<DEFINE_PER_CPU_SHARED_ALIGNED([^,]*, *\([[:alnum:]_]*\)/\1/v/'
+        '/\<DECLARE_WAIT_QUEUE_HEAD(\([[:alnum:]_]*\)/\1/v/'
+        '/\<DECLARE_\(TASKLET\|WORK\|DELAYED_WORK\)(\([[:alnum:]_]*\)/\2/v/'
+        '/\<DEFINE_PCI_DEVICE_TABLE(\([[:alnum:]_]*\)/\1/v/'
+        '/\(^\s\)OFFSET(\([[:alnum:]_]*\)/\2/v/'
+        '/\(^\s\)DEFINE(\([[:alnum:]_]*\)/\2/v/'
+        '/\<DEFINE_HASHTABLE(\([[:alnum:]_]*\)/\1/v/'
+)
+regex_kconfig=(
+        '/^[[:blank:]]*\(menu\|\)config[[:blank:]]\+\([[:alnum:]_]\+\)/\2/'
+        '/^[[:blank:]]*\(menu\|\)config[[:blank:]]\+\([[:alnum:]_]\+\)/CONFIG_\2/'
+)
+setup_regex()
+{
+        local mode=$1 lang tmp=() r
+        shift
+
+        regex=()
+        for lang; do
+                case "$lang" in
+                asm)       tmp=("${regex_asm[@]}") ;;
+                c)         tmp=("${regex_c[@]}") ;;
+                kconfig)   tmp=("${regex_kconfig[@]}") ;;
+                esac
+                for r in "${tmp[@]}"; do
+                        if test "$mode" = "exuberant"; then
+                                regex[${#regex[@]}]="--regex-$lang=${r}b"
+                        else
+                                # Remove ctags /kind-spec/
+                                case "$r" in
+                                /*/*/?/)
+                                        r=${r%?/}
+                                esac
+                                # Prepend ^[^#] unless already anchored
+                                case "$r" in
+                                /^*) ;;
+                                *)
+                                        r="/^[^#]*${r#/}"
+                                esac
+                                regex[${#regex[@]}]="--regex=$r"
+                        fi
+                done
+        done
+}
+
 exuberant()
 {
+        setup_regex exuberant asm c
         all_target_sources | xargs $1 -a                        \
         -I __initdata,__exitdata,__initconst,                   \
         -I __initdata_memblock                                  \
@@ -165,116 +259,21 @@ exuberant()
         -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL,ACPI_EXPORT_SYMBOL   \
         -I DEFINE_TRACE,EXPORT_TRACEPOINT_SYMBOL,EXPORT_TRACEPOINT_SYMBOL_GPL \
         -I static,const                                         \
-        --extra=+f --c-kinds=+px                                \
-        --regex-asm='/^(ENTRY|_GLOBAL)\(([^)]*)\).*/\2/'        \
-        --regex-c='/^SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/sys_\1/' \
-        --regex-c='/^COMPAT_SYSCALL_DEFINE[[:digit:]]?\(([^,)]*).*/compat_sys_\1/' \
-        --regex-c++='/^TRACE_EVENT\(([^,)]*).*/trace_\1/'               \
-        --regex-c++='/^TRACE_EVENT\(([^,)]*).*/trace_\1_rcuidle/'       \
-        --regex-c++='/^DEFINE_EVENT\([^,)]*, *([^,)]*).*/trace_\1/'     \
-        --regex-c++='/^DEFINE_EVENT\([^,)]*, *([^,)]*).*/trace_\1_rcuidle/' \
-        --regex-c++='/PAGEFLAG\(([^,)]*).*/Page\1/'                     \
-        --regex-c++='/PAGEFLAG\(([^,)]*).*/SetPage\1/'                  \
-        --regex-c++='/PAGEFLAG\(([^,)]*).*/ClearPage\1/'                \
-        --regex-c++='/TESTSETFLAG\(([^,)]*).*/TestSetPage\1/'           \
-        --regex-c++='/TESTPAGEFLAG\(([^,)]*).*/Page\1/'                 \
-        --regex-c++='/SETPAGEFLAG\(([^,)]*).*/SetPage\1/'               \
-        --regex-c++='/__SETPAGEFLAG\(([^,)]*).*/__SetPage\1/'           \
-        --regex-c++='/TESTCLEARFLAG\(([^,)]*).*/TestClearPage\1/'       \
-        --regex-c++='/__TESTCLEARFLAG\(([^,)]*).*/TestClearPage\1/'     \
-        --regex-c++='/CLEARPAGEFLAG\(([^,)]*).*/ClearPage\1/'           \
-        --regex-c++='/__CLEARPAGEFLAG\(([^,)]*).*/__ClearPage\1/'       \
-        --regex-c++='/__PAGEFLAG\(([^,)]*).*/__SetPage\1/'              \
-        --regex-c++='/__PAGEFLAG\(([^,)]*).*/__ClearPage\1/'            \
-        --regex-c++='/PAGEFLAG_FALSE\(([^,)]*).*/Page\1/'               \
-        --regex-c++='/TESTSCFLAG\(([^,)]*).*/TestSetPage\1/'            \
-        --regex-c++='/TESTSCFLAG\(([^,)]*).*/TestClearPage\1/'          \
-        --regex-c++='/SETPAGEFLAG_NOOP\(([^,)]*).*/SetPage\1/'          \
-        --regex-c++='/CLEARPAGEFLAG_NOOP\(([^,)]*).*/ClearPage\1/'      \
-        --regex-c++='/__CLEARPAGEFLAG_NOOP\(([^,)]*).*/__ClearPage\1/'  \
-        --regex-c++='/TESTCLEARFLAG_FALSE\(([^,)]*).*/TestClearPage\1/' \
-        --regex-c++='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/'                \
-        --regex-c++='/TASK_PFA_TEST\([^,]*,\s*([^)]*)\)/task_\1/'       \
-        --regex-c++='/TASK_PFA_SET\([^,]*,\s*([^)]*)\)/task_set_\1/'    \
-        --regex-c++='/TASK_PFA_CLEAR\([^,]*,\s*([^)]*)\)/task_clear_\1/'\
-        --regex-c++='/DEF_MMIO_(IN|OUT)_(X|D)\(([^,]*),\s*[^)]*\)/\3/'  \
-        --regex-c++='/DEBUGGER_BOILERPLATE\(([^,]*)\)/\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/'     \
-        --regex-c='/DEFINE_(RAW_SPINLOCK|RWLOCK|SEQLOCK)\((\w*)/\2/v/'  \
-        --regex-c='/DECLARE_(RWSEM|COMPLETION)\((\w*)/\2/v/'            \
-        --regex-c='/DECLARE_BITMAP\((\w*)/\1/v/'                        \
-        --regex-c='/(^|\s)(|L|H)LIST_HEAD\((\w*)/\3/v/'                 \
-        --regex-c='/(^|\s)RADIX_TREE\((\w*)/\2/v/'                      \
-        --regex-c='/DEFINE_PER_CPU\(([^,]*,\s*)(\w*).*\)/\2/v/'         \
-        --regex-c='/DEFINE_PER_CPU_SHARED_ALIGNED\(([^,]*,\s*)(\w*).*\)/\2/v/' \
-        --regex-c='/DECLARE_WAIT_QUEUE_HEAD\((\w*)/\1/v/'               \
-        --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='/DEFINE_HASHTABLE\((\w*)/\1/v/'
+        --extra=+f --c-kinds=+px --langmap=c:+.h "${regex[@]}"
 
+        setup_regex exuberant kconfig
         all_kconfigs | xargs $1 -a                              \
-        --langdef=kconfig --language-force=kconfig              \
-        --regex-kconfig='/^[[:blank:]]*(menu|)config[[:blank:]]+([[:alnum:]_]+)/\2/'
+        --langdef=kconfig --language-force=kconfig "${regex[@]}"
 
-        all_kconfigs | xargs $1 -a                              \
-        --langdef=kconfig --language-force=kconfig              \
-        --regex-kconfig='/^[[:blank:]]*(menu|)config[[:blank:]]+([[:alnum:]_]+)/CONFIG_\2/'
-
-        all_defconfigs | xargs -r $1 -a                         \
-        --langdef=dotconfig --language-force=dotconfig          \
-        --regex-dotconfig='/^#?[[:blank:]]*(CONFIG_[[:alnum:]_]+)/\1/'
 }
 
 emacs()
 {
-        all_target_sources | xargs $1 -a                        \
-        --regex='/^\(ENTRY\|_GLOBAL\)(\([^)]*\)).*/\2/'         \
-        --regex='/^SYSCALL_DEFINE[0-9]?(\([^,)]*\).*/sys_\1/'   \
-        --regex='/^COMPAT_SYSCALL_DEFINE[0-9]?(\([^,)]*\).*/compat_sys_\1/' \
-        --regex='/^TRACE_EVENT(\([^,)]*\).*/trace_\1/'          \
-        --regex='/^TRACE_EVENT(\([^,)]*\).*/trace_\1_rcuidle/'  \
-        --regex='/^DEFINE_EVENT([^,)]*, *\([^,)]*\).*/trace_\1/' \
-        --regex='/^DEFINE_EVENT([^,)]*, *\([^,)]*\).*/trace_\1_rcuidle/' \
-        --regex='/PAGEFLAG(\([^,)]*\).*/Page\1/'                        \
-        --regex='/PAGEFLAG(\([^,)]*\).*/SetPage\1/'             \
-        --regex='/PAGEFLAG(\([^,)]*\).*/ClearPage\1/'           \
-        --regex='/TESTSETFLAG(\([^,)]*\).*/TestSetPage\1/'      \
-        --regex='/TESTPAGEFLAG(\([^,)]*\).*/Page\1/'            \
-        --regex='/SETPAGEFLAG(\([^,)]*\).*/SetPage\1/'          \
-        --regex='/__SETPAGEFLAG(\([^,)]*\).*/__SetPage\1/'      \
-        --regex='/TESTCLEARFLAG(\([^,)]*\).*/TestClearPage\1/'  \
-        --regex='/__TESTCLEARFLAG(\([^,)]*\).*/TestClearPage\1/'        \
-        --regex='/CLEARPAGEFLAG(\([^,)]*\).*/ClearPage\1/'      \
-        --regex='/__CLEARPAGEFLAG(\([^,)]*\).*/__ClearPage\1/'  \
-        --regex='/__PAGEFLAG(\([^,)]*\).*/__SetPage\1/'         \
-        --regex='/__PAGEFLAG(\([^,)]*\).*/__ClearPage\1/'       \
-        --regex='/PAGEFLAG_FALSE(\([^,)]*\).*/Page\1/'          \
-        --regex='/TESTSCFLAG(\([^,)]*\).*/TestSetPage\1/'       \
-        --regex='/TESTSCFLAG(\([^,)]*\).*/TestClearPage\1/'     \
-        --regex='/SETPAGEFLAG_NOOP(\([^,)]*\).*/SetPage\1/'     \
-        --regex='/CLEARPAGEFLAG_NOOP(\([^,)]*\).*/ClearPage\1/' \
-        --regex='/__CLEARPAGEFLAG_NOOP(\([^,)]*\).*/__ClearPage\1/' \
-        --regex='/TESTCLEARFLAG_FALSE(\([^,)]*\).*/TestClearPage\1/' \
-        --regex='/TASK_PFA_TEST\([^,]*,\s*([^)]*)\)/task_\1/'           \
-        --regex='/TASK_PFA_SET\([^,]*,\s*([^)]*)\)/task_set_\1/'        \
-        --regex='/TASK_PFA_CLEAR\([^,]*,\s*([^)]*)\)/task_clear_\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='/[^#]*DEFINE_HASHTABLE(\([^,)]*\)/\1/'
-
-        all_kconfigs | xargs $1 -a                              \
-        --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'
-
-        all_kconfigs | xargs $1 -a                              \
-        --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/CONFIG_\3/'
+        setup_regex emacs asm c
+        all_target_sources | xargs $1 -a "${regex[@]}"
 
-        all_defconfigs | xargs -r $1 -a                         \
-        --regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'
+        setup_regex emacs kconfig
+        all_kconfigs | xargs $1 -a "${regex[@]}"
 }
 
 xtags()