diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-02 09:42:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-02 09:42:55 -0700 |
commit | 97754175042e77d02c4232d5fb24c16abd1c77f1 (patch) | |
tree | 5f318edf0420807259835b40c3a269f8e1267057 | |
parent | 8f6b7676ceecc1f40df77d5a4d6a8bae87594a2d (diff) | |
parent | 0eb043d0eec44cd083ea6910b1db2f77eb212ebd (diff) | |
download | linux-stable-97754175042e77d02c4232d5fb24c16abd1c77f1.tar.gz linux-stable-97754175042e77d02c4232d5fb24c16abd1c77f1.tar.bz2 linux-stable-97754175042e77d02c4232d5fb24c16abd1c77f1.zip |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull 'make cscope' fix from Michal Marek:
"The kbuild.git#misc pull request introduced a bug that broke make
cscope. Apparently, both the original author and me only tested the
use case that the commit was supposed to improve (make tags/TAGS), and
not the use case that was not supposed (make cscope)."
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
tags.sh: Add missing quotes
-rwxr-xr-x | scripts/tags.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/tags.sh b/scripts/tags.sh index 0d6004e20658..cf7b12fee573 100755 --- a/scripts/tags.sh +++ b/scripts/tags.sh @@ -254,6 +254,6 @@ case "$1" in esac # Remove structure forward declarations. -if [ -n $remove_structs ]; then +if [ -n "$remove_structs" ]; then LANG=C sed -i -e '/^\([a-zA-Z_][a-zA-Z0-9_]*\)\t.*\t\/\^struct \1;.*\$\/;"\tx$/d' $1 fi |