]> Git Repo - linux.git/commitdiff
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
authorLinus Torvalds <[email protected]>
Wed, 27 Feb 2013 20:27:18 +0000 (12:27 -0800)
committerLinus Torvalds <[email protected]>
Wed, 27 Feb 2013 20:27:18 +0000 (12:27 -0800)
Pull misc non-critical kbuild changes from Michal Marek:

 - Fix for make TAGS

 - Fix for make rpm

 - Some new coccinelle semantic patches

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  scripts/coccinelle: find constant additions that could be bit ors
  coccicheck: Allow to show the executed command line
  coccicheck: Allow the user to give a V= (verbose) argument
  scripts/coccinelle/misc/memcpy-assign.cocci: Replace memcpy with struct assignment
  kbuild: clear KBUILD_SRC when calling 'make' in RPM spec
  scripts/coccinelle/misc/semicolon.cocci: Add unneeded semicolon test
  scripts/tags.sh: Fix regex syntax for etags

1  2 
scripts/tags.sh

diff --combined scripts/tags.sh
index 65f9595acea9bbbe450e4aeaa4ca61d296f84c12,4c53b7d883d36c805509861db2566d25b0f01c8b..26a87e68afed13fd3aa92a694f8021cdd1a02d10
@@@ -149,17 -149,12 +149,17 @@@ dogtags(
  exuberant()
  {
        all_target_sources | xargs $1 -a                        \
 -      -I __initdata,__exitdata,__acquires,__releases          \
 -      -I __read_mostly,____cacheline_aligned                  \
 +      -I __initdata,__exitdata,__initconst,__devinitdata      \
 +      -I __devinitconst,__cpuinitdata,__initdata_memblock     \
 +      -I __refdata,__attribute                                \
 +      -I __acquires,__releases,__deprecated                   \
 +      -I __read_mostly,__aligned,____cacheline_aligned        \
        -I ____cacheline_aligned_in_smp                         \
        -I ____cacheline_internodealigned_in_smp                \
 +      -I __used,__packed,__packed2__,__must_check,__must_hold \
        -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL                      \
        -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++='/TESTCLEARFLAG_FALSE\(([^,)]*).*/TestClearPage\1/' \
        --regex-c++='/__TESTCLEARFLAG_FALSE\(([^,)]*).*/__TestClearPage\1/' \
        --regex-c++='/_PE\(([^,)]*).*/PEVENT_ERRNO__\1/'                \
 -      --regex-c='/PCI_OP_READ\(([a-z]*[a-z]).*[1-4]\)/pci_bus_read_config_\1/' \
 -      --regex-c='/PCI_OP_WRITE\(([a-z]*[a-z]).*[1-4]\)/pci_bus_write_config_\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/'
  
        all_kconfigs | xargs $1 -a                              \
        --langdef=kconfig --language-force=kconfig              \
  emacs()
  {
        all_target_sources | xargs $1 -a                        \
-       --regex='/^(ENTRY|_GLOBAL)(\([^)]*\)).*/\2/'            \
+       --regex='/^\(ENTRY\|_GLOBAL\)(\([^)]*\)).*/\2/'         \
        --regex='/^SYSCALL_DEFINE[0-9]?(\([^,)]*\).*/sys_\1/'   \
        --regex='/^TRACE_EVENT(\([^,)]*\).*/trace_\1/'          \
        --regex='/^DEFINE_EVENT([^,)]*, *\([^,)]*\).*/trace_\1/' \
-       --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='/__TESTCLEARFLAG_FALSE\(([^,)]*).*/__TestClearPage\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='/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='/__TESTCLEARFLAG_FALSE(\([^,)]*\).*/__TestClearPage\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/'
  
        all_kconfigs | xargs $1 -a                              \
        --regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'
This page took 0.06115 seconds and 4 git commands to generate.