Merge branch 'origin/master' (early part)

13 files changed, 24 insertions, 16 deletions

diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index 23bd9ff10..2e628508d 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -153,4 +153,3 @@ $(host-cshlib): %: $(host-cshobjs) FORCE
 
 targets += $(host-csingle)  $(host-cmulti) $(host-cobjs)\
            $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
-
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index be679b624..3e54ea712 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -168,5 +168,3 @@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
 
 quiet_cmd_gzip = GZIP    $@
 cmd_gzip = gzip -f -9 < $< > $@
-
-
diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c
index 50ef37157..db30019d8 100644
--- a/scripts/basic/docproc.c
+++ b/scripts/basic/docproc.c
@@ -397,4 +397,3 @@ int main(int argc, char **argv)
         fflush(stdout);
         return exitstatus;
 }
-
diff --git a/scripts/find_stray_empty_lines b/scripts/find_stray_empty_lines
new file mode 100755
index 000000000..aae18f99b
--- /dev/null
+++ b/scripts/find_stray_empty_lines
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+grep -n -B1 -r $'^\t*}$' . | grep -A1 '.[ch]-[0-9]*-$'
+grep -n -A1 -r $'^\t*{$' . | grep -B1 '.[ch]-[0-9]*-$'
+# or (less surefire ones):
+grep -n -B1 -r $'^\t*}' . | grep -A1 '.[ch]-[0-9]*-$'
+grep -n -A1 -r $'^\t*{' . | grep -B1 '.[ch]-[0-9]*-$'
+
+# find trailing empty lines
+find -type f | while read file; do
+        test x"$file" = x"" && continue
+        tail -n1 $file | while read lastline
+        do
+          #echo "|$file|$lastline"
+          if test x"$lastline" = x""; then
+                echo "$file"
+          fi
+        done
+done
diff --git a/scripts/gen_build_files.sh b/scripts/gen_build_files.sh
index 968158758..18c172d5a 100755
--- a/scripts/gen_build_files.sh
+++ b/scripts/gen_build_files.sh
@@ -53,8 +53,8 @@ fi
 
         src="$srctree/$d/Kbuild.src"
         dst="$d/Kbuild"
-        mkdir -p -- "$d" 2>/dev/null
         if test -f "$src"; then
+                mkdir -p -- "$d" 2>/dev/null
                 #echo "  CHK     $dst"
 
                 s=`sed -n 's@^//kbuild:@@p' -- "$srctree/$d"/*.c`
@@ -73,8 +73,8 @@ fi
 
         src="$srctree/$d/Config.src"
         dst="$d/Config.in"
-        mkdir -p -- "$d" 2>/dev/null
         if test -f "$src"; then
+                mkdir -p -- "$d" 2>/dev/null
                 #echo "  CHK     $dst"
 
                 s=`sed -n 's@^//config:@@p' -- "$srctree/$d"/*.c`
diff --git a/scripts/kconfig/check.sh b/scripts/kconfig/check.sh
index fa59cbf9d..15fc29421 100755
--- a/scripts/kconfig/check.sh
+++ b/scripts/kconfig/check.sh
@@ -11,4 +11,3 @@ EOF
 if [ ! "$?" -eq "0"  ]; then
         echo -DKBUILD_NO_NLS;
 fi
-
diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped
index 5fc323de3..51f15e175 100644
--- a/scripts/kconfig/lex.zconf.c_shipped
+++ b/scripts/kconfig/lex.zconf.c_shipped
@@ -2235,13 +2235,14 @@ static void zconf_endhelp(void)
  */
 FILE *zconf_fopen(const char *name)
 {
-        char *env, fullname[PATH_MAX+1];
+        char *env;
         FILE *f;
 
         f = fopen(name, "r");
         if (!f && name[0] != '/') {
                 env = getenv(SRCTREE);
                 if (env) {
+                        char *fullname = alloca(strlen(env) + strlen(name) + 2);
                         sprintf(fullname, "%s/%s", env, name);
                         f = fopen(fullname, "r");
                 }
@@ -2322,4 +2323,3 @@ char *zconf_curname(void)
 {
         return current_pos.file ? current_pos.file->name : "<none>";
 }
-
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 0fce20cb7..14cf2ead0 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -394,4 +394,3 @@ struct menu *menu_get_parent_menu(struct menu *menu)
         }
         return menu;
 }
-
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index ef4c83228..263091945 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -112,4 +112,3 @@ const char *str_get(struct gstr *gs)
 {
         return gs->s;
 }
-
diff --git a/scripts/kconfig/zconf.hash.c_shipped b/scripts/kconfig/zconf.hash.c_shipped
index 345f0fc07..d39cf189a 100644
--- a/scripts/kconfig/zconf.hash.c_shipped
+++ b/scripts/kconfig/zconf.hash.c_shipped
@@ -228,4 +228,3 @@ kconf_id_lookup (register const char *str, register unsigned int len)
     }
   return 0;
 }
-
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped
index b62724da0..a27d256d6 100644
--- a/scripts/kconfig/zconf.tab.c_shipped
+++ b/scripts/kconfig/zconf.tab.c_shipped
@@ -2169,5 +2169,3 @@ void zconfdump(FILE *out)
 #include "expr.c"
 #include "symbol.c"
 #include "menu.c"
-
-
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 2007a4e02..bef5e92a3 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -473,7 +473,7 @@ void conf_parse(const char *name)
         menu_finalize(&rootmenu);
         for_all_symbols(i, sym) {
                 sym_check_deps(sym);
-        }
+        }
 
         sym_change_count = 1;
 }
diff --git a/scripts/showasm b/scripts/showasm
index 046442653..dc2cd705d 100755
--- a/scripts/showasm
+++ b/scripts/showasm
@@ -18,4 +18,3 @@ then
 fi
 
 objdump -d $1 | sed -n -e '/./{H;$!d}' -e "x;/^.[0-9a-fA-F]* <$2>:/p"
-